changeset
merge of '2d7e5d40bca82454f1e14bae53b3cffe7e15282a'
Fri, 17 Aug 2007 22:50:12 +0000
- author
- Gabriel Schulhof <nix@go-nix.ca>
- date
- Fri, 17 Aug 2007 22:50:12 +0000
- changeset 19437
- bf96d365f8da
- parent 19424
- 2d7e5d40bca8 (diff)
- parent 19436
- 2fc8e8e0d590 (current diff)
- child 19438
- dc8d0b7b47cd
merge of '2d7e5d40bca82454f1e14bae53b3cffe7e15282a'
and '2fc8e8e0d5903571c57dd857f15b9a02d114d732'
--- 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);
