# HG changeset patch # User Richard Laager # Date 1195254012 0 # Node ID b00c94436918cbed4c574a6f123d397299f07fc6 # Parent 0ecc58c20d8b7b37a83bde7d02281d7d0cf38ace# Parent 998cf5d0b401cf4f9a9a25601ca3d84fc1b65596 merge of 'b2a396d17dcaf8a381d711f406c759863a99557c' and 'e74d2965b33e0b66fc8795aedef2ed48e1d0bc39' diff -r 998cf5d0b401 -r b00c94436918 ChangeLog --- a/ChangeLog Fri Nov 16 23:00:03 2007 +0000 +++ b/ChangeLog Fri Nov 16 23:00:12 2007 +0000 @@ -12,8 +12,6 @@ remove the plugin from the list of saved plugins so it won't load at the next startup. Previously, we were ignoring this case, which could lead to crashes. - * Mark dialog windows as transient for appropriate parent windows to - help window managers do the right thing (Gabriel Schulhof) Finch: * If a plugin says it can't be unloaded, we now display an error and diff -r 998cf5d0b401 -r b00c94436918 ChangeLog.API --- a/ChangeLog.API Fri Nov 16 23:00:03 2007 +0000 +++ b/ChangeLog.API Fri Nov 16 23:00:12 2007 +0000 @@ -15,26 +15,6 @@ from being saved in the saved plugins list, so it'll won't be loaded at the next startup. - * pidgin_dialogs_about_with_parent() - * pidgin_log_show_contact_with_parent() - * pidgin_log_show_with_parent() - * pidgin_plugin_dialog_show_with_parent() - * pidgin_pounce_editor_show_with_parent() - * pidgin_pounces_manager_show_with_parent() - * pidgin_syslog_show_with_parent() - - * purple_request_accept_cancel_with_hint() - * purple_request_action_varg_with_hint() - * purple_request_action_with_hint() - * purple_request_choice_varg_with_hint() - * purple_request_choice_with_hint() - * purple_request_fields_with_hint() - * purple_request_file_with_hint() - * purple_request_folder_with_hint() - * purple_request_input_with_hint() - * purple_request_ok_cancel_with_hint() - * purple_request_yes_no_with_hint() - Changed: * purple_plugin_unload() now honors the return value of a plugin's unload function and can actually return FALSE now. @@ -42,27 +22,6 @@ when a dependent plugin fails to unload. The UI should do something appropriate. - Deprecated: - * pidgin_dialogs_about() - * pidgin_log_show_contact() - * pidgin_log_show() - * pidgin_plugin_dialog_show() - * pidgin_pounce_editor_show() - * pidgin_pounces_manager_show() - * pidgin_syslog_show() - - * purple_request_accept_cancel() - * purple_request_action_varg() - * purple_request_action() - * purple_request_choice_varg() - * purple_request_choice() - * purple_request_fields() - * purple_request_file() - * purple_request_folder() - * purple_request_input() - * purple_request_ok_cancel() - * purple_request_yes_no() - version 2.2.2 (??/??/????): libpurple: Changed: diff -r 998cf5d0b401 -r b00c94436918 finch/gntaccount.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntblist.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntcertmgr.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntconn.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntplugin.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntpounce.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntprefs.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntrequest.c diff -r 998cf5d0b401 -r b00c94436918 finch/gntstatus.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/account.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/certificate.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/conversation.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/ft.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/plugins/autoaccept.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/plugins/buddynote.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/plugins/idle.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/plugins/offlinemsg.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/plugins/perl/common/Request.xs diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/gg/gg.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/auth.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/buddy.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/chat.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/jabber.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/presence.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/si.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/usermood.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/usernick.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/jabber/xdata.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/msn/dialog.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/msn/msn.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/novell/novell.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/oscar/oscar.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/oscar/peer.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/buddy_info.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/buddy_opt.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/group.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/group_im.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/group_join.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/group_opt.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/qq.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/qq/sys_msg.c --- a/libpurple/protocols/qq/sys_msg.c Fri Nov 16 23:00:03 2007 +0000 +++ b/libpurple/protocols/qq/sys_msg.c Fri Nov 16 23:00:12 2007 +0000 @@ -83,7 +83,7 @@ qq_send_packet_get_info(gc, uid, TRUE); /* we want to see window */ nombre = uid_to_purple_name(uid); - purple_request_action_with_hint + purple_request_action (gc, NULL, _("Do you want to approve the request?"), "", 2, purple_connection_get_account(gc), nombre, NULL, "chat", g, 2, @@ -106,11 +106,11 @@ qq_send_packet_get_info(gc, uid, TRUE); /* we want to see window */ nombre = uid_to_purple_name(uid); - purple_request_action_with_hint + purple_request_action (gc, NULL, _("Do you want to add this buddy?"), "", 2, purple_connection_get_account(gc), nombre, NULL, "buddy", g, 2, - _("Cancel"), NULL, + _("Cancel"), NULL, _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid)); g_free(nombre); } @@ -239,7 +239,7 @@ reason = g_strdup_printf(_("Message: %s"), msg_utf8); _qq_sys_msg_log_write(gc, message, from); - purple_request_action_with_hint + purple_request_action (gc, NULL, message, reason, 2, purple_connection_get_account(gc), name, NULL, "buddy", g, 3, diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/sametime/sametime.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/buddy.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/chat.c --- a/libpurple/protocols/silc/chat.c Fri Nov 16 23:00:03 2007 +0000 +++ b/libpurple/protocols/silc/chat.c Fri Nov 16 23:00:12 2007 +0000 @@ -301,7 +301,7 @@ f = purple_request_fields_get_field(fields, "list"); if (!purple_request_field_list_get_selected(f)) { /* Add new public key */ - purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE, + purple_request_file)with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE, G_CALLBACK(silcpurple_chat_chpk_add), G_CALLBACK(silcpurple_chat_chpk_cancel), purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/ops.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/pk.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/silc.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/util.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc/wb.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/buddy.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/chat.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/ops.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/pk.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/silc.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/util.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/silc10/wb.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/toc/toc.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/protocols/yahoo/yahoo.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/request.c diff -r 998cf5d0b401 -r b00c94436918 libpurple/request.h --- a/libpurple/request.h Fri Nov 16 23:00:03 2007 +0000 +++ b/libpurple/request.h Fri Nov 16 23:00:12 2007 +0000 @@ -1303,8 +1303,6 @@ * @param user_data The data to pass to the callback. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_input_with_hint(void *handle, const char *title, const char *primary, const char *secondary, @@ -1316,42 +1314,6 @@ const char *ui_hint, void *user_data); /** - * Prompts the user for text input. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. The - * handle is used to programmatically close - * the request dialog when it is no longer - * needed. For PRPLs this is often a pointer - * to the PurpleConnection instance. For plugins - * this should be a similar, unique memory - * location. This value is important because - * it allows a request to be closed, say, when - * you sign offline. If the request is NOT - * closed it is VERY likely to cause a crash - * whenever the callback handler functions are - * triggered. - * @param title The title of the message. - * @param primary The main point of the message. - * @param secondary The secondary information. - * @param default_value The default value. - * @param multiline TRUE if the inputted text can span multiple lines. - * @param masked TRUE if the inputted text should be masked in some way. - * @param hint Optionally suggest how the input box should appear. - * Use "html," for example, to allow the user to enter - * HTML. - * @param ok_text The text for the @c OK button. - * @param ok_cb The callback for the @c OK button. - * @param cancel_text The text for the @c Cancel button. - * @param cancel_cb The callback for the @c Cancel button. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_input_with_hint() instead. */ void *purple_request_input(void *handle, const char *title, @@ -1386,8 +1348,6 @@ * terminated with a NULL parameter. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_choice_with_hint(void *handle, const char *title, const char *primary, const char *secondary, @@ -1398,29 +1358,6 @@ const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED; /** - * Prompts the user for multiple-choice input. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title of the message. - * @param primary The main point of the message. - * @param secondary The secondary information. - * @param default_value The default value. - * @param ok_text The text for the @c OK button. - * @param ok_cb The callback for the @c OK button. - * @param cancel_text The text for the @c Cancel button. - * @param cancel_cb The callback for the @c Cancel button. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * @param ... The choices. This argument list should be - * terminated with a NULL parameter. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_choice_with_hint() instead. */ void *purple_request_choice(void *handle, const char *title, @@ -1454,8 +1391,6 @@ * terminated with a @c NULL parameter. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_choice_varg_with_hint(void *handle, const char *title, const char *primary, const char *secondary, @@ -1466,29 +1401,6 @@ const char *ui_hint, void *user_data, va_list choices); /** - * Prompts the user for multiple-choice input. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title of the message. - * @param primary The main point of the message. - * @param secondary The secondary information. - * @param default_value The default value. - * @param ok_text The text for the @c OK button. - * @param ok_cb The callback for the @c OK button. - * @param cancel_text The text for the @c Cancel button. - * @param cancel_cb The callback for the @c Cancel button. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * @param choices The choices. This argument list should be - * terminated with a @c NULL parameter. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_choice_varg_with_hint() instead. */ void *purple_request_choice_varg(void *handle, const char *title, @@ -1526,8 +1438,6 @@ * function to use when the button is clicked. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_action_with_hint(void *handle, const char *title, const char *primary, const char *secondary, @@ -1536,33 +1446,6 @@ const char *ui_hint, void *user_data, size_t action_count, ...); /** - * Prompts the user for an action. - * - * This is often represented as a dialog with a button for each action. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title of the message. - * @param primary The main point of the message. - * @param secondary The secondary information. - * @param default_action The default value. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * @param action_count The number of actions. - * @param ... A list of actions. These are pairs of - * arguments. The first of each pair is the - * string that appears on the button. It should - * have an underscore before the letter you want - * to use as the accelerator key for the button. - * The second of each pair is the callback - * function to use when the button is clicked. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_action_with_hint() instead. */ void *purple_request_action(void *handle, const char *title, @@ -1592,8 +1475,6 @@ * @param actions A list of actions and callbacks. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_action_varg_with_hint(void *handle, const char *title, const char *primary, const char *secondary, @@ -1603,27 +1484,6 @@ va_list actions); /** - * Prompts the user for an action. - * - * This is often represented as a dialog with a button for each action. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title of the message. - * @param primary The main point of the message. - * @param secondary The secondary information. - * @param default_action The default value. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * @param action_count The number of actions. - * @param actions A list of actions and callbacks. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_action_varg_with_hint() instead. */ void *purple_request_action_varg(void *handle, const char *title, @@ -1654,8 +1514,6 @@ * @param user_data The data to pass to the callback. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_fields_with_hint(void *handle, const char *title, const char *primary, const char *secondary, @@ -1666,27 +1524,6 @@ const char *ui_hint, void *user_data); /** - * Displays groups of fields for the user to fill in. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title of the message. - * @param primary The main point of the message. - * @param secondary The secondary information. - * @param fields The list of fields. - * @param ok_text The text for the @c OK button. - * @param ok_cb The callback for the @c OK button. - * @param cancel_text The text for the @c Cancel button. - * @param cancel_cb The callback for the @c Cancel button. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy associated with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_fields_with_hint() instead. */ void *purple_request_fields(void *handle, const char *title, @@ -1714,8 +1551,6 @@ /** * A wrapper for purple_request_action() that uses @c Yes and @c No buttons. - * - * @since 2.3.0 */ #define purple_request_yes_no_with_hint(handle, title, primary, secondary, \ default_action, account, who, conv, \ @@ -1725,8 +1560,6 @@ _("_Yes"), (yes_cb), _("_No"), (no_cb)) /** - * A wrapper for purple_request_action() that uses @c Yes and @c No buttons. - * * @deprecated Please use purple_request_yes_no_with_hint instead. */ #define purple_request_yes_no(handle, title, primary, secondary, \ @@ -1738,8 +1571,6 @@ /** * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. - * - * @since 2.3.0 */ #define purple_request_ok_cancel_with_hint(handle, title, primary, secondary, \ default_action, account, who, conv, \ @@ -1749,8 +1580,6 @@ _("_OK"), (ok_cb), _("_Cancel"), (cancel_cb)) /** - * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. - * * @deprecated Please use purple_request_ok_cancel_with_hint instead. */ #define purple_request_ok_cancel(handle, title, primary, secondary, \ @@ -1762,8 +1591,6 @@ /** * A wrapper for purple_request_action() that uses Accept and Cancel buttons. - * - * @since 2.3.0 */ #define purple_request_accept_cancel_with_hint(handle, title, primary, secondary, \ default_action, account, who, conv, \ @@ -1773,8 +1600,6 @@ _("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb)) /** - * A wrapper for purple_request_action() that uses Accept and Cancel buttons. - * * @deprecated Please use purple_request_accept_cancel_with_hint instead. */ #define purple_request_accept_cancel(handle, title, primary, secondary, \ @@ -1804,8 +1629,6 @@ * @param user_data The data to pass to the callback. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_file_with_hint(void *handle, const char *title, const char *filename, gboolean savedialog, @@ -1814,26 +1637,6 @@ const char *ui_hint, void *user_data); /** - * Displays a file selector request dialog. Returns the selected filename to - * the callback. Can be used for either opening a file or saving a file. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title for the dialog (may be @c NULL) - * @param filename The default filename (may be @c NULL) - * @param savedialog True if this dialog is being used to save a file. - * False if it is being used to open a file. - * @param ok_cb The callback for the @c OK button. - * @param cancel_cb The callback for the @c Cancel button. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_file_with_hint() instead. */ void *purple_request_file(void *handle, const char *title, const char *filename, @@ -1860,8 +1663,6 @@ * @param user_data The data to pass to the callback. * * @return A UI-specific handle. - * - * @since 2.3.0 */ void *purple_request_folder_with_hint(void *handle, const char *title, const char *dirname, GCallback ok_cb, GCallback cancel_cb, @@ -1869,24 +1670,6 @@ const char *ui_hint, void *user_data); /** - * Displays a folder select dialog. Returns the selected filename to - * the callback. - * - * @param handle The plugin or connection handle. For some - * things this is EXTREMELY important. See - * the comments on purple_request_input. - * @param title The title for the dialog (may be @c NULL) - * @param dirname The default directory name (may be @c NULL) - * @param ok_cb The callback for the @c OK button. - * @param cancel_cb The callback for the @c Cancel button. - * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is - * @param conv The PurpleConversation associated with this request, or NULL if none is - * @param ui_hint UI hint - * @param user_data The data to pass to the callback. - * - * @return A UI-specific handle. - * * @deprecated Please use purple_request_folder_with_hint() instead. */ void *purple_request_folder(void *handle, const char *title, const char *dirname, diff -r 998cf5d0b401 -r b00c94436918 libpurple/server.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkaccount.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkblist.c Fri Nov 16 23:00:12 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) @@ -643,7 +643,7 @@ name = prpl_info->get_chat_name(c->components); } } else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { - pidgin_log_show_contact_with_parent(GTK_WINDOW(gtkblist->window), (PurpleContact *)node); + pidgin_log_show_contact((PurpleContact *)node); pidgin_clear_cursor(gtkblist->window); return; } else { @@ -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, gtk_blist_show_systemlog_cb, 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 998cf5d0b401 -r b00c94436918 pidgin/gtkcertmgr.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkdebug.c Fri Nov 16 23:00:12 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 998cf5d0b401 -r b00c94436918 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkdialogs.c Fri Nov 16 23:00:12 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 998cf5d0b401 -r b00c94436918 pidgin/gtkdialogs.h --- a/pidgin/gtkdialogs.h Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkdialogs.h Fri Nov 16 23:00:12 2007 +0000 @@ -31,19 +31,8 @@ #include "conversation.h" /* Functions in gtkdialogs.c (these should actually stay in this file) */ - void pidgin_dialogs_destroy_all(void); - -/** - * @deprecated Use pidgin_dialogs_about_with_parent() instead. - */ void pidgin_dialogs_about(void); - -/** - * @since 2.3.0 - */ -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 998cf5d0b401 -r b00c94436918 pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Fri Nov 16 23:00:12 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 998cf5d0b401 -r b00c94436918 pidgin/gtklog.c --- a/pidgin/gtklog.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtklog.c Fri Nov 16 23:00:12 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; @@ -724,7 +720,7 @@ prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); - 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(prpl_icon), purple_log_get_total_size(type, screenname, account)); @@ -734,10 +730,6 @@ } 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; @@ -791,16 +783,11 @@ } 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); } -void pidgin_syslog_show(void) -{ - pidgin_syslog_show_with_parent(NULL); -} - -void pidgin_syslog_show_with_parent(GtkWindow *parent) +void pidgin_syslog_show() { GList *accounts = NULL; GList *logs = NULL; @@ -820,7 +807,7 @@ } logs = g_list_sort(logs, purple_log_compare); - syslog_viewer = display_log_viewer(parent, NULL, logs, _("System Log"), NULL, 0); + syslog_viewer = display_log_viewer(NULL, logs, _("System Log"), NULL, 0); } /**************************************************************************** diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtklog.h --- a/pidgin/gtklog.h Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtklog.h Fri Nov 16 23:00:12 2007 +0000 @@ -52,36 +52,12 @@ }; -/** - * @deprecated Use pidgin_log_show_with_parent() instead. - */ + void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account); - -/** - * @since 2.3.0 - */ -void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account); - -/** - * @deprecated pidgin_log_show_contact_with_parent() instead. - */ void pidgin_log_show_contact(PurpleContact *contact); -/** - * @since 2.3.0 - */ -void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact); - -/** - * @deprecated Use pidgin_syslog_show_with_parent() instead. - */ void pidgin_syslog_show(void); -/** - * @since 2.3.0 - */ -void pidgin_syslog_show_with_parent(GtkWindow *parent); - /**************************************************************************/ /** @name GTK+ Log Subsystem */ /**************************************************************************/ diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkplugin.c --- a/pidgin/gtkplugin.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkplugin.c Fri Nov 16 23:00:12 2007 +0000 @@ -533,11 +533,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; @@ -546,8 +541,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; } @@ -556,8 +549,6 @@ NULL, GTK_DIALOG_NO_SEPARATOR, NULL); - if (parent) - gtk_window_set_transient_for(GTK_WINDOW(plugin_dialog), parent); pref_button = gtk_dialog_add_button(GTK_DIALOG(plugin_dialog), _("Configure Pl_ugin"), PIDGIN_RESPONSE_CONFIGURE); gtk_dialog_add_button(GTK_DIALOG(plugin_dialog), diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkplugin.h --- a/pidgin/gtkplugin.h Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkplugin.h Fri Nov 16 23:00:12 2007 +0000 @@ -74,16 +74,7 @@ /** * Shows the Plugins dialog - * - * @deprecated Use pidgin_plugin_dialog_show_with_parent() instead. */ void pidgin_plugin_dialog_show(void); -/** - * Shows the Plugins dialog, transient to a parent window - * - * @since 2.3.0 - */ -void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent); - #endif /* _PIDGINPLUGIN_H_ */ diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkpounce.c --- a/pidgin/gtkpounce.c Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkpounce.c Fri Nov 16 23:00:12 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; } @@ -1318,12 +1311,6 @@ void pidgin_pounces_manager_show(void) { - pidgin_pounces_manager_show_with_parent(NULL); -} - -void -pidgin_pounces_manager_show_with_parent(GtkWindow *parent) -{ PouncesManager *dialog; GtkWidget *bbox; GtkWidget *button; @@ -1334,7 +1321,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 +1331,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 998cf5d0b401 -r b00c94436918 pidgin/gtkpounce.h --- a/pidgin/gtkpounce.h Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/gtkpounce.h Fri Nov 16 23:00:12 2007 +0000 @@ -34,40 +34,16 @@ * @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. - * - * @deprecated Use pidgin_pounce_editor_show_with_parent() instead. */ void pidgin_pounce_editor_show(PurpleAccount *account, const char *name, PurplePounce *cur_pounce); /** - * 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. - * - * @since 2.3.0 - */ -void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name, - PurplePounce *cur_pounce); - -/** * Shows the pounces manager window. - * - * @deprecated Use pidgin_pounces_manager_show_with_parent() instead. */ void pidgin_pounces_manager_show(void); /** - * Shows the pounces manager window. - * - * @since 2.3.0 - */ -void pidgin_pounces_manager_show_with_parent(GtkWindow *parent); - -/** * Hides the pounces manager window. */ void pidgin_pounces_manager_hide(void); diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkprefs.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkprivacy.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkrequest.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtksavedstatuses.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/gtkstatusbox.c diff -r 998cf5d0b401 -r b00c94436918 pidgin/plugins/perl/common/GtkDialogs.xs --- a/pidgin/plugins/perl/common/GtkDialogs.xs Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkDialogs.xs Fri Nov 16 23:00:12 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 998cf5d0b401 -r b00c94436918 pidgin/plugins/perl/common/GtkLog.xs --- a/pidgin/plugins/perl/common/GtkLog.xs Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkLog.xs Fri Nov 16 23:00:12 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 998cf5d0b401 -r b00c94436918 pidgin/plugins/perl/common/GtkPlugin.xs --- a/pidgin/plugins/perl/common/GtkPlugin.xs Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkPlugin.xs Fri Nov 16 23:00:12 2007 +0000 @@ -11,7 +11,3 @@ void pidgin_plugin_dialog_show() - -void -pidgin_plugin_dialog_show_with_parent(parent) - void * parent diff -r 998cf5d0b401 -r b00c94436918 pidgin/plugins/perl/common/GtkPounce.xs --- a/pidgin/plugins/perl/common/GtkPounce.xs Fri Nov 16 23:00:03 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkPounce.xs Fri Nov 16 23:00:12 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()