Mercurial > pidgin
changeset 16463:1a639d73682a
merge of 'c65d07a2cae7269a05604304bc897121643ffa92'
and 'c9ebc8d73c819c4060d2e2da0862d5daf6cde434'
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Thu, 26 Apr 2007 23:49:24 +0000 |
| parents | bff667bfb1d1 (current diff) 4b6d81d26b56 (diff) |
| children | b2044e10915a |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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