Mercurial > pidgin
changeset 19924:e19a9e7cf15d
merge of '157af56b7d2b30861754d904bd1a501357ee10a7'
and 'fc666ac71d6625f3d3433d18f931f602c755d311'
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Fri, 17 Aug 2007 22:50:12 +0000 |
| parents | e42b22d0f564 (diff) 96d5d37e08f0 (current diff) |
| children | 9c091f83c185 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Fri Aug 17 22:41:15 2007 +0000 +++ b/pidgin/gtkaccount.c Fri Aug 17 22:50:12 2007 +0000 @@ -1912,7 +1912,7 @@ purple_request_close_with_handle(account); purple_request_action(account, NULL, buf, NULL, 0, account, NULL, NULL, - account, 2, + "accounts", account, 2, _("Delete"), delete_account_cb, _("Cancel"), NULL); g_free(buf);
--- a/pidgin/gtklog.h Fri Aug 17 22:41:15 2007 +0000 +++ b/pidgin/gtklog.h Fri Aug 17 22:50:12 2007 +0000 @@ -51,8 +51,8 @@ -void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account); -void pidgin_log_show_contact(PurpleContact *contact); +void pidgin_log_show(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account); +void pidgin_log_show_contact(GtkWindow *parent, PurpleContact *contact); void pidgin_syslog_show(void);