# HG changeset patch # User Gabriel Schulhof # Date 1191962827 0 # Node ID 96612191ded8e27a21ed27e8d3f667651466e48d # Parent 488796f5ba33cca538188fba0d233c161f07eeb0 Only the request API changes diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkblist.c Tue Oct 09 20:47:07 2007 +0000 @@ -617,7 +617,7 @@ static void gtk_blist_menu_bp_cb(GtkWidget *w, PurpleBuddy *b) { - pidgin_pounce_editor_show_with_parent(GTK_WINDOW(gtkblist->window), b->account, b->name, NULL); + pidgin_pounce_editor_show(b->account, b->name, NULL); } static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node) @@ -655,7 +655,7 @@ } if (name && account) { - pidgin_log_show_with_parent(GTK_WINDOW(gtkblist->window), type, name, account); + pidgin_log_show(type, name, account); g_free(name); pidgin_clear_cursor(gtkblist->window); @@ -682,6 +682,11 @@ pidgin_blist_update(purple_get_blist(), node); } +static void gtk_blist_show_systemlog_cb() +{ + pidgin_syslog_show(); +} + static void gtk_blist_show_onlinehelp_cb() { purple_notify_uri(NULL, PURPLE_WEBSITE "documentation"); @@ -3052,11 +3057,6 @@ !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 * @@ -3090,15 +3090,15 @@ /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "", NULL }, - { N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_with_parent, (int)pidgin_pounces_manager_show_with_parent, "", NULL }, + { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "", NULL }, { N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "", NULL }, - { N_("/Tools/Plu_gins"), "U", pidgin_blist_show_with_parent, (int)pidgin_plugin_dialog_show_with_parent, "", PIDGIN_STOCK_TOOLBAR_PLUGINS }, + { N_("/Tools/Plu_gins"), "U", pidgin_plugin_dialog_show, 0, "", PIDGIN_STOCK_TOOLBAR_PLUGINS }, { N_("/Tools/Pr_eferences"), "P", pidgin_prefs_show, 0, "", GTK_STOCK_PREFERENCES }, { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "", NULL }, { "/Tools/sep2", NULL, NULL, 0, "", NULL }, { N_("/Tools/_File Transfers"), "T", pidgin_xfer_dialog_show, 0, "", NULL }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "", NULL }, - { N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, (int)pidgin_syslog_show_with_parent, "", NULL }, + { N_("/Tools/System _Log"), NULL, pidgin_syslog_show, 0, "", NULL }, { "/Tools/sep3", NULL, NULL, 0, "", NULL }, { N_("/Tools/Mute _Sounds"), "S", pidgin_blist_mute_sounds_cb, 0, "", NULL }, /* Help */ @@ -3106,9 +3106,9 @@ { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "", GTK_STOCK_HELP }, { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "", NULL }, #if GTK_CHECK_VERSION(2,6,0) - { N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "", GTK_STOCK_ABOUT }, + { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "", GTK_STOCK_ABOUT }, #else - { N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "", NULL }, + { N_("/Help/_About"), NULL, pidgin_dialogs_about, 0, "", NULL }, #endif }; diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkdebug.c Tue Oct 09 20:47:07 2007 +0000 @@ -36,7 +36,6 @@ #include "gtkimhtml.h" #include "gtkutils.h" #include "pidginstock.h" -#include "gtkblist.h" #ifdef HAVE_REGEX_H # include @@ -674,7 +673,6 @@ static DebugWindow * debug_window_new(void) { - PidginBuddyList *blist; DebugWindow *win; GtkWidget *vbox; GtkWidget *toolbar; @@ -689,9 +687,6 @@ height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height"); PIDGIN_DIALOG(win->window); - if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL) - if (blist->window) - gtk_window_set_transient_for(GTK_WINDOW(win->window), GTK_WINDOW(blist->window)); purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n", width, height); diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkdialogs.c Tue Oct 09 20:47:07 2007 +0000 @@ -334,13 +334,6 @@ void pidgin_dialogs_about() { - PidginBuddyList *blist = pidgin_blist_get_default_gtk_blist(); - - pidgin_dialogs_about_with_parent(blist ? GTK_WINDOW(blist->window) : NULL); -} - -void pidgin_dialogs_about_with_parent(GtkWindow *parent) -{ GtkWidget *hbox; GtkWidget *vbox; GtkWidget *logo; @@ -356,15 +349,11 @@ GdkPixbuf *pixbuf; if (about != NULL) { - if (parent) - gtk_window_set_transient_for(GTK_WINDOW(about), parent); gtk_window_present(GTK_WINDOW(about)); return; } PIDGIN_DIALOG(about); - if (parent) - gtk_window_set_transient_for(GTK_WINDOW(about), parent); tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME); gtk_window_set_title(GTK_WINDOW(about), tmp); g_free(tmp); diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkdialogs.h --- a/pidgin/gtkdialogs.h Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkdialogs.h Tue Oct 09 20:47:07 2007 +0000 @@ -33,7 +33,6 @@ /* Functions in gtkdialogs.c (these should actually stay in this file) */ void pidgin_dialogs_destroy_all(void); void pidgin_dialogs_about(void); -void pidgin_dialogs_about_with_parent(GtkWindow *parent); void pidgin_dialogs_im(void); void pidgin_dialogs_im_with_user(PurpleAccount *, const char *); void pidgin_dialogs_info(void); diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Tue Oct 09 20:47:07 2007 +0000 @@ -184,8 +184,6 @@ g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", G_CALLBACK(realize_toolbar_font), toolbar); } - gtk_window_set_transient_for(GTK_WINDOW(toolbar->font_dialog), - GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar)))); gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); } else { cancel_toolbar_font(font, toolbar); @@ -711,8 +709,6 @@ gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); - gtk_window_set_transient_for(GTK_WINDOW(dialog), - GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar)))); if (unique_smileys != NULL) { struct smiley_button_list *ls, *it, *it_tmp; diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtklog.c --- a/pidgin/gtklog.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtklog.c Tue Oct 09 20:47:07 2007 +0000 @@ -523,7 +523,7 @@ } } -static PidginLogViewer *display_log_viewer(GtkWindow *parent, struct log_viewer_hash_t *ht, GList *logs, +static PidginLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *logs, const char *title, GtkWidget *icon, int log_size) { PidginLogViewer *lv; @@ -569,7 +569,7 @@ g_hash_table_insert(log_viewers, ht, lv); /* Window ***********/ - lv->window = gtk_dialog_new_with_buttons(title, parent, 0, + lv->window = gtk_dialog_new_with_buttons(title, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); #ifdef _WIN32 /* Steal the "HELP" response and use it to trigger browsing to the logs folder */ @@ -676,10 +676,6 @@ } void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account) { - pidgin_log_show_with_parent(NULL, type, screenname, account); -} - -void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account) { struct log_viewer_hash_t *ht; PidginLogViewer *lv = NULL; const char *name = screenname; @@ -721,17 +717,13 @@ title = g_strdup_printf(_("Conversations with %s"), name); } - display_log_viewer(parent, ht, purple_log_get_logs(type, screenname, account), + display_log_viewer(ht, purple_log_get_logs(type, screenname, account), title, gtk_image_new_from_pixbuf(pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM)), purple_log_get_total_size(type, screenname, account)); g_free(title); } void pidgin_log_show_contact(PurpleContact *contact) { - pidgin_log_show_contact_with_parent(NULL, contact); -} - -void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact) { struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1); PurpleBlistNode *child; PidginLogViewer *lv = NULL; @@ -785,7 +777,7 @@ } title = g_strdup_printf(_("Conversations with %s"), name); - display_log_viewer(parent, ht, logs, title, image, total_log_size); + display_log_viewer(ht, logs, title, image, total_log_size); g_free(title); } diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtklog.h --- a/pidgin/gtklog.h Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtklog.h Tue Oct 09 20:47:07 2007 +0000 @@ -54,12 +54,9 @@ void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account); -void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account); void pidgin_log_show_contact(PurpleContact *contact); -void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact); void pidgin_syslog_show(void); -void pidgin_syslog_show_with_parent(GtkWindow *parent); /**************************************************************************/ /** @name GTK+ Log Subsystem */ diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkplugin.c --- a/pidgin/gtkplugin.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkplugin.c Tue Oct 09 20:47:07 2007 +0000 @@ -516,11 +516,6 @@ void pidgin_plugin_dialog_show() { - pidgin_plugin_dialog_show_with_parent(NULL); -} - -void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent) -{ GtkWidget *sw; GtkWidget *event_view; GtkListStore *ls; @@ -529,8 +524,6 @@ GtkTreeSelection *sel; if (plugin_dialog != NULL) { - if (parent) - gtk_window_set_transient_for(GTK_WINDOW(plugin_dialog), parent); gtk_window_present(GTK_WINDOW(plugin_dialog)); return; } diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkplugin.h --- a/pidgin/gtkplugin.h Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkplugin.h Tue Oct 09 20:47:07 2007 +0000 @@ -77,9 +77,4 @@ */ void pidgin_plugin_dialog_show(void); -/** - * Shows the Plugins dialog, transient to a parent window - */ -void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent); - #endif /* _PIDGINPLUGIN_H_ */ diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkpounce.c --- a/pidgin/gtkpounce.c Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkpounce.c Tue Oct 09 20:47:07 2007 +0000 @@ -472,13 +472,6 @@ pidgin_pounce_editor_show(PurpleAccount *account, const char *name, PurplePounce *cur_pounce) { - pidgin_pounce_editor_show_with_parent(NULL, account, name, cur_pounce); -} - -void -pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name, - PurplePounce *cur_pounce) -{ PidginPounceDialog *dialog; GtkWidget *window; GtkWidget *label; @@ -1057,7 +1050,7 @@ static void pounces_manager_add_cb(GtkButton *button, gpointer user_data) { - pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, NULL); + pidgin_pounce_editor_show(NULL, NULL, NULL); } static void @@ -1067,7 +1060,7 @@ PurplePounce *pounce; gtk_tree_model_get(model, iter, POUNCES_MANAGER_COLUMN_POUNCE, &pounce, -1); - pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, pounce); + pidgin_pounce_editor_show(NULL, NULL, pounce); } static void @@ -1167,7 +1160,7 @@ if ((pounce != NULL) && (event->button == 1) && (event->type == GDK_2BUTTON_PRESS)) { - pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, pounce); + pidgin_pounce_editor_show(NULL, NULL, pounce); return TRUE; } @@ -1316,14 +1309,7 @@ } void -pidgin_pounces_manager_show() -{ - pidgin_pounces_manager_show_with_parent(NULL); -} - -void -pidgin_pounces_manager_show_with_parent(GtkWindow *parent) -{ +pidgin_pounces_manager_show(void) PouncesManager *dialog; GtkWidget *bbox; GtkWidget *button; @@ -1334,7 +1320,6 @@ if (pounces_manager != NULL) { gtk_window_present(GTK_WINDOW(pounces_manager->window)); - gtk_window_set_transient_for(GTK_WINDOW(pounces_manager->window), parent); return; } @@ -1345,7 +1330,6 @@ dialog->window = win = pidgin_create_window(_("Buddy Pounces"), PIDGIN_HIG_BORDER, "pounces", TRUE); gtk_window_set_default_size(GTK_WINDOW(win), width, height); - gtk_window_set_transient_for(GTK_WINDOW(win), parent); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(pounces_manager_destroy_cb), dialog); diff -r 488796f5ba33 -r 96612191ded8 pidgin/gtkpounce.h --- a/pidgin/gtkpounce.h Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/gtkpounce.h Tue Oct 09 20:47:07 2007 +0000 @@ -31,28 +31,16 @@ /** * Displays a New Buddy Pounce or Edit Buddy Pounce dialog. * - * @param parent The parent window. * @param account The optional account to use. * @param name The optional name to pounce on. * @param cur_pounce The current buddy pounce, if editing an existing one. */ -void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name, - PurplePounce *cur_pounce); - -/** - * @deprecated Please use pidgin_pounce_editor_show_with_parent - */ void pidgin_pounce_editor_show(PurpleAccount *account, const char *name, PurplePounce *cur_pounce); /** * Shows the pounces manager window. */ -void pidgin_pounces_manager_show_with_parent(GtkWindow *parent); - -/** - * @deprecated Please use pidgin_pounces_manager_show_with_parent - */ void pidgin_pounces_manager_show(void); /** diff -r 488796f5ba33 -r 96612191ded8 pidgin/plugins/perl/common/GtkDialogs.xs --- a/pidgin/plugins/perl/common/GtkDialogs.xs Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkDialogs.xs Tue Oct 09 20:47:07 2007 +0000 @@ -10,10 +10,6 @@ pidgin_dialogs_about() void -pidgin_dialogs_about_with_parent(parent) - void * parent - -void pidgin_dialogs_im() void diff -r 488796f5ba33 -r 96612191ded8 pidgin/plugins/perl/common/GtkLog.xs --- a/pidgin/plugins/perl/common/GtkLog.xs Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkLog.xs Tue Oct 09 20:47:07 2007 +0000 @@ -13,27 +13,11 @@ Purple::Account account void -pidgin_log_show_with_parent(parent, type, screenname, account) - void * parent - Purple::LogType type - const char * screenname - Purple::Account account - -void pidgin_log_show_contact(contact) Purple::BuddyList::Contact contact -void -pidgin_log_show_contact_with_parent(parent, contact) - void * parent - Purple::BuddyList::Contact contact - MODULE = Pidgin::Log PACKAGE = Pidgin::SysLog PREFIX = pidgin_syslog_ PROTOTYPES: ENABLE void pidgin_syslog_show() - -void -pidgin_syslog_show_with_parent(parent) - void * parent diff -r 488796f5ba33 -r 96612191ded8 pidgin/plugins/perl/common/GtkPlugin.xs --- a/pidgin/plugins/perl/common/GtkPlugin.xs Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkPlugin.xs Tue Oct 09 20:47:07 2007 +0000 @@ -11,7 +11,3 @@ void pidgin_plugin_dialog_show() - -void -pidgin_plugin_dialog_show_with_parent(parent) - void * parent diff -r 488796f5ba33 -r 96612191ded8 pidgin/plugins/perl/common/GtkPounce.xs --- a/pidgin/plugins/perl/common/GtkPounce.xs Tue Oct 09 18:01:51 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkPounce.xs Tue Oct 09 20:47:07 2007 +0000 @@ -9,13 +9,6 @@ const char * name Purple::Pounce cur_pounce -void -pidgin_pounce_editor_show_with_parent(parent, account, name, cur_pounce) - void * parent - Purple::Account account - const char * name - Purple::Pounce cur_pounce - MODULE = Pidgin::Pounce PACKAGE = Pidgin::Pounces PREFIX = pidgin_pounces_ PROTOTYPES: ENABLE @@ -29,8 +22,4 @@ pidgin_pounces_manager_show() void -pidgin_pounces_manager_show_with_parent(parent) - void * parent - -void pidgin_pounces_manager_hide()