# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1177631364 0
# Node ID 1a639d73682a0c716e5beaf26318c6b4a50cac4d
# Parent  bff667bfb1d10c097836c4b0c1ffffa54c9e54f6# Parent  4b6d81d26b568cf619c09776c6bea6cca98c8870
merge of 'c65d07a2cae7269a05604304bc897121643ffa92'
     and 'c9ebc8d73c819c4060d2e2da0862d5daf6cde434'

diff -r bff667bfb1d1 -r 1a639d73682a finch/gntaccount.c
--- a/finch/gntaccount.c	Thu Apr 26 23:22:31 2007 +0000
+++ b/finch/gntaccount.c	Thu Apr 26 23:49:24 2007 +0000
@@ -611,10 +611,10 @@
 	prompt = g_strdup_printf(_("Are you sure you want to delete %s?"),
 			purple_account_get_username(account));
 
-	purple_request_action(account, _("Delete Account"), prompt, NULL, 0, account, 2,
-			_("Delete"), really_delete_account, _("Cancel"),
-			account, NULL, NULL,
-			NULL);
+	purple_request_action(account, _("Delete Account"), prompt, NULL, 0,
+						  account, NULL, NULL, account, 2,
+						  _("Delete"), really_delete_account,
+						  _("Cancel"), NULL);
 	g_free(prompt);
 }
 
diff -r bff667bfb1d1 -r 1a639d73682a pidgin.desktop.in
--- a/pidgin.desktop.in	Thu Apr 26 23:22:31 2007 +0000
+++ b/pidgin.desktop.in	Thu Apr 26 23:49:24 2007 +0000
@@ -4,7 +4,7 @@
 _GenericName=Internet Messenger
 _Comment=Send instant messages over multiple protocols
 Exec=pidgin
-Icon=pidgin.png
+Icon=pidgin
 StartupNotify=true
 Terminal=false
 Type=Application