--- a/pidgin/gtkblist.c Wed Sep 12 15:59:22 2007 +0000
+++ b/pidgin/gtkblist.c Wed Sep 12 19:11:38 2007 +0000
@@ -478,7 +478,7 @@
static void gtk_blist_menu_bp_cb(GtkWidget *w, PurpleBuddy *b)
{
- pidgin_pounce_editor_show(b->account, b->name, NULL);
+ pidgin_pounce_editor_show(GTK_WINDOW(gtkblist->window), b->account, b->name, NULL);
}
static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node)
@@ -504,7 +504,7 @@
name = prpl_info->get_chat_name(c->components);
}
} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
- pidgin_log_show_contact((PurpleContact *)node);
+ pidgin_log_show_contact(GTK_WINDOW(gtkblist->window), (PurpleContact *)node);
pidgin_clear_cursor(gtkblist->window);
return;
} else {
@@ -516,18 +516,13 @@
}
if (name && account) {
- pidgin_log_show(type, name, account);
+ pidgin_log_show(GTK_WINDOW(gtkblist->window), type, name, account);
g_free(name);
pidgin_clear_cursor(gtkblist->window);
}
}
-static void gtk_blist_show_systemlog_cb()
-{
- pidgin_syslog_show();
-}
-
static void gtk_blist_show_onlinehelp_cb()
{
purple_notify_uri(NULL, PURPLE_WEBSITE "documentation");
@@ -2856,6 +2851,11 @@
!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
}
+static void
+pidgin_blist_show_with_parent(gpointer data1, void (*callback)(GtkWindow *parent), gpointer data3)
+{
+ callback(GTK_WINDOW(gtkblist->window));
+}
/***************************************************
* Crap *
@@ -2891,13 +2891,13 @@
{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "<Item>", NULL },
{ N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL },
- { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
+ { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_blist_show_with_parent, (int)pidgin_plugin_dialog_show, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
- { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL },
+ { N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, (int)pidgin_syslog_show, "<Item>", NULL },
{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
/* Help */
@@ -2905,7 +2905,7 @@
{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
#if GTK_CHECK_VERSION(2,6,0)
- { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<StockItem>", GTK_STOCK_ABOUT },
+ { N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about, "<StockItem>", GTK_STOCK_ABOUT },
#else
{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL },
#endif
@@ -4032,7 +4032,7 @@
enabled = purple_account_get_enabled(account, purple_core_get_ui());
purple_request_action(account, _("Connection Error"), primary, text, 2,
account, NULL, NULL,
- account, 3,
+ "account", account, 3,
_("OK"), NULL,
_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
enabled ? _("Connect") : _("Re-enable Account"),
@@ -5970,7 +5970,7 @@
_("Add"), G_CALLBACK(add_group_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- NULL);
+ "blist", NULL);
}
void