Mercurial > pidgin.yaz
changeset 21560:665e04562de0
This merge has the effect of reverting the hinting code from trunk.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 17 Nov 2007 00:12:30 +0000 |
| parents | 9b4d1af17ced (current diff) fcb848b2d669 (diff) |
| children | 7109257d4612 |
| files | ChangeLog ChangeLog.API finch/gntblist.c finch/gntplugin.c finch/gntpounce.c finch/plugins/gnthistory.c libpurple/account.c libpurple/conversation.c libpurple/ft.c libpurple/plugins/autoaccept.c libpurple/plugins/buddynote.c libpurple/plugins/idle.c libpurple/plugins/offlinemsg.c libpurple/plugins/perl/common/Request.xs libpurple/protocols/gg/gg.c libpurple/protocols/jabber/auth.c libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/chat.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/presence.c libpurple/protocols/jabber/si.c libpurple/protocols/jabber/usermood.c libpurple/protocols/msn/msn.c libpurple/protocols/novell/novell.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/peer.c libpurple/protocols/qq/qq.c libpurple/protocols/sametime/sametime.c libpurple/protocols/silc/buddy.c libpurple/protocols/silc/chat.c libpurple/protocols/silc/ops.c libpurple/protocols/silc/pk.c libpurple/protocols/silc/silc.c libpurple/protocols/silc/util.c libpurple/protocols/silc/wb.c libpurple/protocols/silc10/buddy.c libpurple/protocols/silc10/pk.c libpurple/protocols/silc10/silc.c libpurple/protocols/silc10/util.c libpurple/protocols/silc10/wb.c libpurple/protocols/toc/toc.c libpurple/protocols/yahoo/yahoo.c libpurple/purple.h libpurple/request.h pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkcertmgr.c pidgin/gtkconv.c pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkpounce.c pidgin/gtkprefs.c pidgin/gtkprivacy.c pidgin/gtkrequest.c pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c pidgin/gtkutils.c pidgin/pixmaps/animations/16/Makefile.am pidgin/pixmaps/animations/16/Makefile.mingw pidgin/pixmaps/animations/Makefile.am pidgin/pixmaps/animations/Makefile.mingw pidgin/pixmaps/buddy_icons/Makefile.am pidgin/pixmaps/buddy_icons/Makefile.mingw pidgin/pixmaps/dialogs/16/Makefile.am pidgin/pixmaps/dialogs/16/Makefile.mingw pidgin/pixmaps/dialogs/16/scalable/Makefile.am pidgin/pixmaps/dialogs/64/Makefile.am pidgin/pixmaps/dialogs/64/Makefile.mingw pidgin/pixmaps/dialogs/64/scalable/Makefile.am pidgin/pixmaps/dialogs/Makefile.am pidgin/pixmaps/dialogs/Makefile.mingw pidgin/pixmaps/emblems/16/Makefile.am pidgin/pixmaps/emblems/16/Makefile.mingw pidgin/pixmaps/emblems/16/scalable/Makefile.am pidgin/pixmaps/emblems/Makefile.am pidgin/pixmaps/emblems/Makefile.mingw pidgin/pixmaps/emotes/Makefile.am pidgin/pixmaps/emotes/Makefile.mingw pidgin/pixmaps/emotes/default/24/scalable/Makefile.am pidgin/pixmaps/emotes/default/Makefile.am pidgin/pixmaps/emotes/default/Makefile.mingw pidgin/pixmaps/icons/16/Makefile.am pidgin/pixmaps/icons/16/Makefile.mingw pidgin/pixmaps/icons/16/pidgin.png pidgin/pixmaps/icons/16/scalable/Makefile.am pidgin/pixmaps/icons/16/scalable/pidgin.svg pidgin/pixmaps/icons/22/Makefile.am pidgin/pixmaps/icons/22/pidgin.png pidgin/pixmaps/icons/22/scalable/Makefile.am pidgin/pixmaps/icons/22/scalable/pidgin.svg pidgin/pixmaps/icons/24/Makefile.am pidgin/pixmaps/icons/24/Makefile.mingw pidgin/pixmaps/icons/24/pidgin.png pidgin/pixmaps/icons/24/scalable/Makefile.am pidgin/pixmaps/icons/24/scalable/pidgin.svg pidgin/pixmaps/icons/32/Makefile.am pidgin/pixmaps/icons/32/Makefile.mingw pidgin/pixmaps/icons/32/pidgin.png pidgin/pixmaps/icons/32/scalable/Makefile.am pidgin/pixmaps/icons/32/scalable/pidgin.svg pidgin/pixmaps/icons/48/Makefile.am pidgin/pixmaps/icons/48/Makefile.mingw pidgin/pixmaps/icons/48/pidgin.png pidgin/pixmaps/icons/48/scalable/Makefile.am pidgin/pixmaps/icons/48/scalable/pidgin.svg pidgin/pixmaps/icons/Makefile.am pidgin/pixmaps/icons/Makefile.mingw pidgin/pixmaps/protocols/16/Makefile.am pidgin/pixmaps/protocols/16/Makefile.mingw pidgin/pixmaps/protocols/16/scalable/Makefile.am pidgin/pixmaps/protocols/22/Makefile.am pidgin/pixmaps/protocols/22/Makefile.mingw pidgin/pixmaps/protocols/22/scalable/Makefile.am pidgin/pixmaps/protocols/48/Makefile.am pidgin/pixmaps/protocols/48/Makefile.mingw pidgin/pixmaps/protocols/48/scalable/Makefile.am pidgin/pixmaps/protocols/Makefile.am pidgin/pixmaps/protocols/Makefile.mingw pidgin/pixmaps/status/11/Makefile.am pidgin/pixmaps/status/11/Makefile.mingw pidgin/pixmaps/status/11/rtl/Makefile.am pidgin/pixmaps/status/11/rtl/Makefile.mingw pidgin/pixmaps/status/11/scalable/Makefile.am pidgin/pixmaps/status/16/Makefile.am pidgin/pixmaps/status/16/Makefile.mingw pidgin/pixmaps/status/16/rtl/Makefile.am pidgin/pixmaps/status/16/rtl/Makefile.mingw pidgin/pixmaps/status/16/scalable/Makefile.am pidgin/pixmaps/status/22/Makefile.am pidgin/pixmaps/status/22/Makefile.mingw pidgin/pixmaps/status/22/rtl/Makefile.am pidgin/pixmaps/status/22/rtl/Makefile.mingw pidgin/pixmaps/status/22/scalable/Makefile.am pidgin/pixmaps/status/32/Makefile.am pidgin/pixmaps/status/32/Makefile.mingw pidgin/pixmaps/status/32/rtl/Makefile.am pidgin/pixmaps/status/32/rtl/Makefile.mingw pidgin/pixmaps/status/32/scalable/Makefile.am pidgin/pixmaps/status/48/Makefile.am pidgin/pixmaps/status/48/Makefile.mingw pidgin/pixmaps/status/48/rtl/Makefile.am pidgin/pixmaps/status/48/rtl/Makefile.mingw pidgin/pixmaps/status/Makefile.am pidgin/pixmaps/status/Makefile.mingw pidgin/pixmaps/toolbar/16/Makefile.am pidgin/pixmaps/toolbar/16/Makefile.mingw pidgin/pixmaps/toolbar/16/scalable/Makefile.am pidgin/pixmaps/toolbar/22/Makefile.am pidgin/pixmaps/toolbar/22/Makefile.mingw pidgin/pixmaps/toolbar/22/scalable/Makefile.am pidgin/pixmaps/toolbar/Makefile.am pidgin/pixmaps/toolbar/Makefile.mingw pidgin/pixmaps/tray/16/Makefile.am pidgin/pixmaps/tray/16/Makefile.mingw pidgin/pixmaps/tray/16/scalable/Makefile.am pidgin/pixmaps/tray/22/Makefile.am pidgin/pixmaps/tray/22/Makefile.mingw pidgin/pixmaps/tray/22/scalable/Makefile.am pidgin/pixmaps/tray/32/Makefile.am pidgin/pixmaps/tray/32/Makefile.mingw pidgin/pixmaps/tray/48/Makefile.am pidgin/pixmaps/tray/48/Makefile.mingw pidgin/pixmaps/tray/Makefile.am pidgin/pixmaps/tray/Makefile.mingw share/Makefile.am share/Makefile.mingw |
| diffstat | 88 files changed, 432 insertions(+), 1352 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 16 03:39:04 2007 +0000 +++ b/ChangeLog Sat Nov 17 00:12:30 2007 +0000 @@ -20,8 +20,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) * Connection errors are now reported in mini-dialogs inside the buddy list, rather than as buttons in the buddy list and with dialog boxes. If several accounts are disabled when you sign on elsewhere,
--- a/ChangeLog.API Fri Nov 16 03:39:04 2007 +0000 +++ b/ChangeLog.API Sat Nov 17 00:12:30 2007 +0000 @@ -15,7 +15,6 @@ to unload a plugin--fails. This then prevents the plugin from being saved in the saved plugins list, so it'll won't be loaded at the next startup. - * PurpleDisconnectReason enumeration of machine-readable types of connection error. * purple_connection_error_reason(), to be used by prpls @@ -53,42 +52,6 @@ * purple_network_listen_map_external() to temporarily disable mapping ports externally via NAT-PMP or UPnP. - * 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() - - UI hints set by libpurple: - * PURPLE_REQUEST_UI_HINT_ACCOUNT - * PURPLE_REQUEST_UI_HINT_BLIST - * PURPLE_REQUEST_UI_HINT_BUDDY - * PURPLE_REQUEST_UI_HINT_CONV - * PURPLE_REQUEST_UI_HINT_REGISTER - * PURPLE_REQUEST_UI_HINT_XFER - - Common UI hints set by UIs: - * PURPLE_REQUEST_UI_HINT_ACCOUNTMGR - * PURPLE_REQUEST_UI_HINT_CERTMGR - * PURPLE_REQUEST_UI_HINT_PLUGINMGR - * PURPLE_REQUEST_UI_HINT_POUNCEMGR - * PURPLE_REQUEST_UI_HINT_PREFSMGR - * PURPLE_REQUEST_UI_HINT_STATUSMGR - Changed: * purple_plugin_unload() now honors the return value of a plugin's unload function and can actually return FALSE now.
--- a/finch/gntaccount.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntaccount.c Sat Nov 17 00:12:30 2007 +0000 @@ -632,8 +632,8 @@ prompt = g_strdup_printf(_("Are you sure you want to delete %s?"), purple_account_get_username(account)); - purple_request_action_with_hint(account, _("Delete Account"), prompt, NULL, 0, - account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, account, 2, + purple_request_action(account, _("Delete Account"), prompt, NULL, 0, + account, NULL, NULL, account, 2, _("Delete"), really_delete_account, _("Cancel"), NULL); g_free(prompt); @@ -881,10 +881,10 @@ data->alias = (alias != NULL ? g_strdup(alias) : NULL); buffer = make_info(account, gc, remote_user, id, alias, msg); - purple_request_action_with_hint(NULL, NULL, _("Add buddy to your list?"), + purple_request_action(NULL, NULL, _("Add buddy to your list?"), buffer, PURPLE_DEFAULT_ACTION_NONE, account, remote_user, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, data, 2, + data, 2, _("Add"), G_CALLBACK(add_user_cb), _("Cancel"), G_CALLBACK(free_add_user_data)); g_free(buffer); @@ -969,10 +969,10 @@ gnt_box_set_title(GNT_BOX(uihandle), _("Authorize buddy?")); gnt_box_set_pad(GNT_BOX(uihandle), 0); - widget = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL, + widget = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL, PURPLE_DEFAULT_ACTION_NONE, account, remote_user, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, aa, 2, + aa, 2, _("Authorize"), authorize_and_add_cb, _("Deny"), deny_no_add_cb); gnt_screen_release(widget); @@ -996,10 +996,10 @@ g_signal_connect_swapped(G_OBJECT(uihandle), "destroy", G_CALLBACK(free_auth_and_add), aa); } else { - uihandle = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL, + uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL, PURPLE_DEFAULT_ACTION_NONE, account, remote_user, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, user_data, 2, + user_data, 2, _("Authorize"), auth_cb, _("Deny"), deny_cb); }
--- a/finch/gntblist.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntblist.c Sat Nov 17 00:12:30 2007 +0000 @@ -338,12 +338,12 @@ purple_request_field_account_set_value(field, account); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(NULL, _("Add Buddy"), NULL, _("Please enter buddy information."), + purple_request_fields(NULL, _("Add Buddy"), NULL, _("Please enter buddy information."), fields, _("Add"), G_CALLBACK(add_buddy_cb), _("Cancel"), NULL, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static void @@ -416,11 +416,11 @@ field = purple_request_field_bool_new("autojoin", _("Auto-join"), FALSE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(NULL, _("Add Chat"), NULL, + purple_request_fields(NULL, _("Add Chat"), NULL, _("You can edit more information from the context menu later."), fields, _("Add"), G_CALLBACK(add_chat_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static void @@ -451,11 +451,11 @@ static void finch_request_add_group() { - purple_request_input_with_hint(NULL, _("Add Group"), NULL, _("Enter the name of the group"), + purple_request_input(NULL, _("Add Group"), NULL, _("Enter the name of the group"), NULL, FALSE, FALSE, NULL, _("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static PurpleBlistUiOps blist_ui_ops = @@ -799,10 +799,10 @@ g_list_free(parts); - purple_request_fields_with_hint(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."), + purple_request_fields(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."), fields, _("Edit"), G_CALLBACK(chat_components_edit_ok), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, chat); + chat); } static void @@ -1000,11 +1000,11 @@ prompt = g_strdup_printf(_("Please enter the new name for %s"), name); text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Set Alias"); - purple_request_input_with_hint(node, text, prompt, _("Enter empty string to reset the name."), + purple_request_input(node, text, prompt, _("Enter empty string to reset the name."), name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, node); + node); g_free(prompt); } @@ -1092,11 +1092,11 @@ primary = g_strdup_printf(_("Are you sure you want to remove %s?"), name); /* XXX: anything to do with the returned ui-handle? */ - purple_request_action_with_hint(node, _("Confirm Remove"), + purple_request_action(node, _("Confirm Remove"), primary, sec, 1, account, name, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, node, 2, + node, 2, _("Remove"), finch_blist_remove_node, _("Cancel"), NULL); g_free(primary); @@ -2217,7 +2217,7 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(purple_get_blist(), _("New Instant Message"), + purple_request_fields(purple_get_blist(), _("New Instant Message"), NULL, _("Please enter the screen name or alias of the person " "you would like to IM."), @@ -2225,7 +2225,7 @@ _("OK"), G_CALLBACK(send_im_select_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static void @@ -2281,14 +2281,14 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(purple_get_blist(), _("Join a Chat"), + purple_request_fields(purple_get_blist(), _("Join a Chat"), NULL, _("Please enter the name of the chat you want to join."), fields, _("Join"), G_CALLBACK(join_chat_select_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static void
--- a/finch/gntcertmgr.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntcertmgr.c Sat Nov 17 00:12:30 2007 +0000 @@ -82,7 +82,7 @@ if (crt != NULL) { gchar *default_hostname; default_hostname = purple_certificate_get_subject_name(crt); - purple_request_input_with_hint(NULL, + purple_request_input(NULL, _("Certificate Import"), _("Specify a hostname"), _("Type the host name this certificate is for."), @@ -90,7 +90,7 @@ _("OK"), G_CALLBACK(tls_peers_mgmt_import_ok2_cb), _("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb), NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CERTMGR, crt); + crt); g_free(default_hostname); } else { gchar * secondary; @@ -106,13 +106,13 @@ static void add_cert_cb(GntWidget *button, gpointer null) { - purple_request_file_with_hint(NULL, + purple_request_file(NULL, _("Select a PEM certificate"), "certificate.pem", FALSE, G_CALLBACK(tls_peers_mgmt_import_ok_cb), NULL, - NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, NULL ); + NULL, NULL, NULL, NULL ); } /* Save certs in some file */ @@ -155,13 +155,13 @@ return; } - purple_request_file_with_hint((void*)key, + purple_request_file((void*)key, _("PEM X.509 Certificate Export"), "certificate.pem", TRUE, G_CALLBACK(tls_peers_mgmt_export_ok_cb), G_CALLBACK(purple_certificate_destroy), NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CERTMGR, crt); + crt); } /* Show information about a cert */ @@ -233,10 +233,10 @@ primary = g_strdup_printf(_("Really delete certificate for %s?"), key); purple_request_close_with_handle((void *)key); - purple_request_yes_no_with_hint((void *)key, _("Confirm certificate delete"), + purple_request_yes_no((void *)key, _("Confirm certificate delete"), primary, NULL, 2, - NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, + NULL, NULL, NULL, g_strdup(key), tls_peers_mgmt_delete_confirm_cb, g_free);
--- a/finch/gntconn.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntconn.c Sat Nov 17 00:12:30 2007 +0000 @@ -130,9 +130,9 @@ "Finch will not attempt to reconnect the account until you " "correct the error and re-enable the account."), text); - purple_request_action_with_hint(account, NULL, primary, secondary, 2, + purple_request_action(account, NULL, primary, secondary, 2, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, account, 3, + account, 3, _("OK"), NULL, _("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb), _("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb));
--- a/finch/gntplugin.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntplugin.c Sat Nov 17 00:12:30 2007 +0000 @@ -471,9 +471,9 @@ } } - return purple_request_fields_with_hint(NULL, _("Preferences"), NULL, NULL, fields, + return purple_request_fields(NULL, _("Preferences"), NULL, NULL, fields, _("Save"), G_CALLBACK(finch_request_save_in_prefs), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_PLUGINMGR, NULL); + NULL); }
--- a/finch/gntpounce.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntpounce.c Sat Nov 17 00:12:30 2007 +0000 @@ -673,9 +673,9 @@ pouncer = purple_account_get_username(account); pouncee = purple_pounce_get_pouncee(pounce); buf = g_strdup_printf(_("Are you sure you want to delete the pounce on %s for %s?"), pouncee, pouncer); - purple_request_action_with_hint(pounce, NULL, buf, NULL, 0, + purple_request_action(pounce, NULL, buf, NULL, 0, account, pouncee, NULL, - PURPLE_REQUEST_UI_HINT_POUNCEMGR, pounce, 2, + pounce, 2, _("Delete"), pounces_manager_delete_confirm_cb, _("Cancel"), NULL); g_free(buf);
--- a/finch/gntprefs.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntprefs.c Sat Nov 17 00:12:30 2007 +0000 @@ -261,9 +261,9 @@ add_pref_group(fields, _("Idle"), idle); pref_request.showing = TRUE; - pref_request.window = purple_request_fields_with_hint(NULL, _("Preferences"), NULL, NULL, fields, + pref_request.window = purple_request_fields(NULL, _("Preferences"), NULL, NULL, fields, _("Save"), G_CALLBACK(save_cb), _("Cancel"), free_strings, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL); + NULL); }
--- a/finch/gntrequest.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntrequest.c Sat Nov 17 00:12:30 2007 +0000 @@ -148,7 +148,7 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) + void *user_data) { GntWidget *window, *box, *entry; @@ -205,7 +205,7 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, va_list choices) + void *user_data, va_list choices) { GntWidget *window, *combo, *box; const char *text; @@ -249,7 +249,7 @@ finch_request_action(const char *title, const char *primary, const char *secondary, int default_value, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t actioncount, + void *user_data, size_t actioncount, va_list actions) { GntWidget *window, *box, *button; @@ -393,7 +393,7 @@ const char *ok, GCallback ok_cb, const char *cancel, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *userdata) + void *userdata) { GntWidget *window, *box; GList *grlist; @@ -645,7 +645,7 @@ gboolean savedialog, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) + void *user_data) { GntWidget *window = gnt_file_sel_new(); GntFileSel *sel = GNT_FILE_SEL(window);
--- a/finch/gntstatus.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/gntstatus.c Sat Nov 17 00:12:30 2007 +0000 @@ -138,9 +138,9 @@ ask = g_strdup_printf(_("Are you sure you want to delete \"%s\""), purple_savedstatus_get_title(saved)); - purple_request_action_with_hint(saved, _("Delete Status"), ask, NULL, 0, + purple_request_action(saved, _("Delete Status"), ask, NULL, 0, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_STATUSMGR, saved, 2, + saved, 2, _("Delete"), really_delete_status, _("Cancel"), NULL); g_free(ask);
--- a/finch/plugins/gnthistory.c Fri Nov 16 03:39:04 2007 +0000 +++ b/finch/plugins/gnthistory.c Sat Nov 17 00:12:30 2007 +0000 @@ -172,15 +172,14 @@ purple_request_fields_add_group(fields, group); - purple_request_fields_with_hint(plugin, NULL, _("History Plugin Requires Logging"), - _("Logging can be enabled from Tools -> Preferences -> Logging.\n\n" - "Enabling logs for instant messages and/or chats will activate " - "history for the same conversation type(s)."), - fields, - _("OK"), G_CALLBACK(finch_request_save_in_prefs), - _("Cancel"), NULL, - NULL, NULL, NULL, - "42. That's your hint. Take it, or leave it.", plugin); + purple_request_fields(plugin, NULL, _("History Plugin Requires Logging"), + _("Logging can be enabled from Tools -> Preferences -> Logging.\n\n" + "Enabling logs for instant messages and/or chats will activate " + "history for the same conversation type(s)."), + fields, + _("OK"), G_CALLBACK(finch_request_save_in_prefs), + _("Cancel"), NULL, + NULL, NULL, NULL, plugin); } }
--- a/libpurple/account.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/account.c Sat Nov 17 00:12:30 2007 +0000 @@ -1096,7 +1096,7 @@ field = purple_request_field_bool_new("remember", _("Save password"), FALSE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(account, + purple_request_fields(account, NULL, primary, NULL, @@ -1104,7 +1104,7 @@ _("OK"), ok_cb, _("Cancel"), cancel_cb, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, user_data); + user_data); g_free(primary); } @@ -1384,7 +1384,7 @@ /* I'm sticking this somewhere in the code: bologna */ - purple_request_fields_with_hint(purple_account_get_connection(account), + purple_request_fields(purple_account_get_connection(account), NULL, primary, _("Please enter your current password and your " @@ -1393,7 +1393,7 @@ _("OK"), G_CALLBACK(change_password_cb), _("Cancel"), NULL, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, account); + account); } static void @@ -1421,14 +1421,14 @@ _("Change user information for %s"), purple_account_get_username(account)); - purple_request_input_with_hint(gc, _("Set User Info"), primary, NULL, + purple_request_input(gc, _("Set User Info"), primary, NULL, purple_account_get_user_info(account), TRUE, FALSE, ((gc != NULL) && (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL), _("Save"), G_CALLBACK(set_user_info_cb), _("Cancel"), NULL, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, account); + account); } void
--- a/libpurple/certificate.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/certificate.c Sat Nov 17 00:12:30 2007 +0000 @@ -563,7 +563,7 @@ secondary = g_strdup_printf(_("Common name: %s %s\nFingerprint (SHA1): %s"), cn, cn_match, sha_asc); /* Make a semi-pretty display */ - purple_request_accept_cancel_with_hint( + purple_request_accept_cancel( vrq->cb_data, /* TODO: Find what the handle ought to be */ _("Single-use Certificate Verification"), primary, @@ -572,7 +572,6 @@ NULL, /* No account */ NULL, /* No other user */ NULL, /* No associated conversation */ - PURPLE_REQUEST_UI_HINT_BLIST, vrq, x509_singleuse_verify_cb, x509_singleuse_verify_cb ); @@ -1186,7 +1185,7 @@ vrq->subject_name); /* Make a semi-pretty display */ - purple_request_action_with_hint( + purple_request_action( vrq->cb_data, /* TODO: Find what the handle ought to be */ _("SSL Certificate Verification"), primary, @@ -1195,7 +1194,6 @@ NULL, /* No account */ NULL, /* No other user */ NULL, /* No associated conversation */ - PURPLE_REQUEST_UI_HINT_BLIST, x509_tls_cached_ua_ctx_new(vrq, reason), 3, /* Number of actions */ _("Accept"), x509_tls_cached_user_auth_accept_cb,
--- a/libpurple/conversation.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/conversation.c Sat Nov 17 00:12:30 2007 +0000 @@ -1208,9 +1208,9 @@ data[0] = conv; data[1] = (gpointer)message; - purple_request_action_with_hint(conv, NULL, _("Send Message"), text, 0, + purple_request_action(conv, NULL, _("Send Message"), text, 0, purple_conversation_get_account(conv), NULL, conv, - PURPLE_REQUEST_UI_HINT_CONV, data, 2, + data, 2, _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb), _("Cancel"), NULL); }
--- a/libpurple/ft.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/ft.c Sat Nov 17 00:12:30 2007 +0000 @@ -309,12 +309,12 @@ static int purple_xfer_choose_file(PurpleXfer *xfer) { - purple_request_file_with_hint(xfer, NULL, purple_xfer_get_filename(xfer), + purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer), (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE), G_CALLBACK(purple_xfer_choose_file_ok_cb), G_CALLBACK(purple_xfer_choose_file_cancel_cb), purple_xfer_get_account(xfer), xfer->who, NULL, - PURPLE_REQUEST_UI_HINT_XFER, xfer); + xfer); return 0; } @@ -359,10 +359,10 @@ serv_got_im(purple_account_get_connection(xfer->account), xfer->who, xfer->message, 0, time(NULL)); - purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL, + purple_request_accept_cancel(xfer, NULL, buf, NULL, PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, - PURPLE_REQUEST_UI_HINT_XFER, xfer, + xfer, G_CALLBACK(purple_xfer_choose_file), G_CALLBACK(cancel_recv_cb)); @@ -402,10 +402,10 @@ "Remote host: %s\nRemote port: %d"), purple_xfer_get_remote_ip(xfer), purple_xfer_get_remote_port(xfer)); - purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2, + purple_request_accept_cancel(xfer, NULL, buf, buf2, PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, - PURPLE_REQUEST_UI_HINT_XFER, xfer, + xfer, G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel)); g_free(buf);
--- a/libpurple/plugins/autoaccept.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/plugins/autoaccept.c Sat Nov 17 00:12:30 2007 +0000 @@ -159,12 +159,12 @@ message = g_strdup_printf(_("When a file-transfer request arrives from %s"), purple_contact_get_alias((PurpleContact *)node)); - purple_request_choice_with_hint(plugin, _("Set Autoaccept Setting"), message, + purple_request_choice(plugin, _("Set Autoaccept Setting"), message, NULL, purple_blist_node_get_int(node, "autoaccept"), _("_Save"), G_CALLBACK(save_cb), _("_Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_XFER, node, + node, _("Ask"), FT_ASK, _("Auto Accept"), FT_ACCEPT, _("Auto Reject"), FT_REJECT,
--- a/libpurple/plugins/buddynote.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/plugins/buddynote.c Sat Nov 17 00:12:30 2007 +0000 @@ -43,14 +43,14 @@ note = purple_blist_node_get_string(node, "notes"); - purple_request_input_with_hint(node, _("Notes"), + purple_request_input(node, _("Notes"), _("Enter your notes below..."), NULL, note, TRUE, FALSE, "html", _("Save"), G_CALLBACK(do_it_cb), _("Cancel"), G_CALLBACK(dont_do_it_cb), NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, node); + node); } static void
--- a/libpurple/plugins/idle.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/plugins/idle.c Sat Nov 17 00:12:30 2007 +0000 @@ -161,7 +161,7 @@ request = purple_request_fields_new(); purple_request_fields_add_group(request, group); - purple_request_fields_with_hint(action->plugin, + purple_request_fields(action->plugin, N_("I'dle Mak'er"), _("Set Account Idle Time"), NULL, @@ -169,7 +169,7 @@ _("_Set"), G_CALLBACK(idle_action_ok), _("_Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL); + NULL); } static void @@ -195,7 +195,7 @@ request = purple_request_fields_new(); purple_request_fields_add_group(request, group); - purple_request_fields_with_hint(action->plugin, + purple_request_fields(action->plugin, N_("I'dle Mak'er"), _("Unset Account Idle Time"), NULL, @@ -203,7 +203,7 @@ _("_Unset"), G_CALLBACK(unidle_action_ok), _("_Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL); + NULL); } static void @@ -221,7 +221,7 @@ request = purple_request_fields_new(); purple_request_fields_add_group(request, group); - purple_request_fields_with_hint(action->plugin, + purple_request_fields(action->plugin, N_("I'dle Mak'er"), _("Set Idle Time for All Accounts"), NULL, @@ -229,7 +229,7 @@ _("_Set"), G_CALLBACK(idle_all_action_ok), _("_Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL); + NULL); } static void
--- a/libpurple/plugins/offlinemsg.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/plugins/offlinemsg.c Sat Nov 17 00:12:30 2007 +0000 @@ -157,11 +157,11 @@ "rest of the messages in a pounce and automatically send them " "when \"%s\" logs back in?"), who, who); - purple_request_action_with_hint(handle, _("Offline Message"), ask, + purple_request_action(handle, _("Offline Message"), ask, _("You can edit/delete the pounce from the `Buddy Pounces' dialog"), 1, offline->account, offline->who, offline->conv, - PURPLE_REQUEST_UI_HINT_BUDDY, offline, 2, + offline, 2, _("Yes"), record_pounce, _("No"), cancel_poune); g_free(ask);
--- a/libpurple/plugins/perl/common/Request.xs Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/plugins/perl/common/Request.xs Sat Nov 17 00:12:30 2007 +0000 @@ -141,38 +141,7 @@ gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len)); g_free(basename); - RETVAL = purple_request_input_with_hint(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gpr); -OUTPUT: - RETVAL - -void * -purple_request_input_with_hint(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb, cancel_text, cancel_cb, ui_hint) - Purple::Plugin handle - const char * title - const char * primary - const char * secondary - const char * default_value - gboolean multiline - gboolean masked - gchar * hint - const char * ok_text - SV * ok_cb - const char * cancel_text - SV * cancel_cb - const char * ui_hint -CODE: - PurplePerlRequestData *gpr; - STRLEN len; - char *basename; - - basename = g_path_get_basename(handle->path); - purple_perl_normalize_script_name(basename); - gpr = g_new(PurplePerlRequestData, 1); - gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len)); - gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len)); - g_free(basename); - - RETVAL = purple_request_input_with_hint(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, ui_hint, gpr); + RETVAL = purple_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr); OUTPUT: RETVAL @@ -196,32 +165,7 @@ gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len)); g_free(basename); - RETVAL = purple_request_file_with_hint(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gpr); -OUTPUT: - RETVAL - -void * -purple_request_file_with_hint(handle, title, filename, savedialog, ok_cb, cancel_cb, ui_hint) - Purple::Plugin handle - const char * title - const char * filename - gboolean savedialog - SV * ok_cb - SV * cancel_cb - const char * ui_hint -CODE: - PurplePerlRequestData *gpr; - STRLEN len; - char *basename; - - basename = g_path_get_basename(handle->path); - purple_perl_normalize_script_name(basename); - gpr = g_new(PurplePerlRequestData, 1); - gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len)); - gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len)); - g_free(basename); - - RETVAL = purple_request_file_with_hint(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, ui_hint, gpr); + RETVAL = purple_request_file(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr); OUTPUT: RETVAL @@ -248,35 +192,7 @@ gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len)); g_free(basename); - RETVAL = purple_request_fields_with_hint(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gpr); -OUTPUT: - RETVAL - -void * -purple_request_fields_with_hint(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb, ui_hint) - Purple::Plugin handle - const char * title - const char * primary - const char * secondary - Purple::Request::Fields fields - const char * ok_text - SV * ok_cb - const char * cancel_text - SV * cancel_cb - const char *ui_hint -CODE: - PurplePerlRequestData *gpr; - STRLEN len; - char *basename; - - basename = g_path_get_basename(handle->path); - purple_perl_normalize_script_name(basename); - gpr = g_new(PurplePerlRequestData, 1); - gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len)); - gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len)); - g_free(basename); - - RETVAL = purple_request_fields_with_hint(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, ui_hint, gpr); + RETVAL = purple_request_fields(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr); OUTPUT: RETVAL
--- a/libpurple/protocols/gg/gg.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/gg/gg.c Sat Nov 17 00:12:30 2007 +0000 @@ -329,10 +329,10 @@ { PurpleConnection *gc = (PurpleConnection *)action->context; - purple_request_file_with_hint(action, _("Save buddylist..."), NULL, TRUE, + purple_request_file(action, _("Save buddylist..."), NULL, TRUE, G_CALLBACK(ggp_callback_buddylist_save_ok), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc); } /* }}} */ @@ -343,10 +343,10 @@ { PurpleConnection *gc = (PurpleConnection *)action->context; - purple_request_file_with_hint(action, "Load buddylist from file...", NULL, FALSE, + purple_request_file(action, "Load buddylist from file...", NULL, FALSE, G_CALLBACK(ggp_callback_buddylist_load_ok), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc); } /* }}} */ @@ -499,7 +499,7 @@ _("Current token"), token->data, token->size); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(account, + purple_request_fields(account, _("Register New Gadu-Gadu Account"), _("Register New Gadu-Gadu Account"), _("Please, fill in the following fields"), @@ -507,7 +507,7 @@ _("OK"), G_CALLBACK(ggp_callback_register_account_ok), _("Cancel"), G_CALLBACK(ggp_callback_register_account_cancel), purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_REGISTER, gc); + gc); } /* }}} */ @@ -658,7 +658,7 @@ _("Only online"), FALSE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(gc, + purple_request_fields(gc, _("Find buddies"), _("Find buddies"), _("Please, enter your search criteria below"), @@ -666,7 +666,7 @@ _("OK"), G_CALLBACK(ggp_callback_find_buddies), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc); } /* }}} */ @@ -796,14 +796,14 @@ _("Please, enter your current password and your new password for UIN: "), ggp_get_uin(purple_connection_get_account(gc))); - purple_request_fields_with_hint(gc, + purple_request_fields(gc, _("Change Gadu-Gadu Password"), _("Change Gadu-Gadu Password"), msg, fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); g_free(msg); } @@ -877,7 +877,7 @@ msg = g_strdup_printf(_("Select a chat for buddy: %s"), purple_buddy_get_alias(buddy)); - purple_request_fields_with_hint(gc, + purple_request_fields(gc, _("Add to chat..."), _("Add to chat..."), msg, @@ -885,7 +885,7 @@ _("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, gc); + gc); g_free(msg); } /* }}} */
--- a/libpurple/protocols/jabber/auth.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/auth.c Sat Nov 17 00:12:30 2007 +0000 @@ -322,10 +322,10 @@ } else if (!plaintext) { char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), js->gc->account->username); - purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), + purple_request_yes_no(js->gc, _("Plaintext Authentication"), _("Plaintext Authentication"), msg, - 2, js->gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNT, js->gc->account, + 2, js->gc->account, NULL, NULL, js->gc->account, allow_cyrus_plaintext_auth, disallow_plaintext_auth); g_free(msg); @@ -517,13 +517,13 @@ if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) { char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), js->gc->account->username); - purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), + purple_request_yes_no(js->gc, _("Plaintext Authentication"), _("Plaintext Authentication"), msg, 2, purple_connection_get_account(js->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc), - allow_plaintext_auth, disallow_plaintext_auth); + purple_connection_get_account(js->gc), allow_plaintext_auth, + disallow_plaintext_auth); g_free(msg); return; } @@ -611,13 +611,13 @@ } else if(xmlnode_get_child(query, "password")) { if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) { - purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"), + purple_request_yes_no(js->gc, _("Plaintext Authentication"), _("Plaintext Authentication"), _("This server requires plaintext authentication over an unencrypted connection. Allow this and continue authentication?"), 2, purple_connection_get_account(js->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc), - allow_plaintext_auth, disallow_plaintext_auth); + purple_connection_get_account(js->gc), allow_plaintext_auth, + disallow_plaintext_auth); return; } finish_plaintext_authentication(js);
--- a/libpurple/protocols/jabber/buddy.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.c Sat Nov 17 00:12:30 2007 +0000 @@ -719,7 +719,7 @@ if(x_vc_data != NULL) xmlnode_free(x_vc_data); - purple_request_fields_with_hint(gc, _("Edit XMPP vCard"), + purple_request_fields(gc, _("Edit XMPP vCard"), _("Edit XMPP vCard"), _("All items below are optional. Enter only the " "information with which you feel comfortable."), @@ -727,7 +727,7 @@ _("Save"), G_CALLBACK(jabber_format_info), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } /*---------------------------------------*/ @@ -2420,12 +2420,12 @@ usi->js = js; usi->directory_server = g_strdup(from); - purple_request_fields_with_hint(js->gc, _("Search for XMPP users"), + purple_request_fields(js->gc, _("Search for XMPP users"), _("Search for XMPP users"), instructions, fields, _("Search"), G_CALLBACK(user_search_cb), _("Cancel"), G_CALLBACK(user_search_cancel_cb), purple_connection_get_account(js->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, usi); + usi); g_free(instructions); } @@ -2454,14 +2454,14 @@ PurpleConnection *gc = (PurpleConnection *) action->context; JabberStream *js = gc->proto_data; - purple_request_input_with_hint(gc, _("Enter a User Directory"), _("Enter a User Directory"), + purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"), _("Select a user directory to search"), js->user_directories ? js->user_directories->data : NULL, FALSE, FALSE, NULL, _("Search Directory"), PURPLE_CALLBACK(jabber_user_search), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, js); + js); }
--- a/libpurple/protocols/jabber/chat.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/chat.c Sat Nov 17 00:12:30 2007 +0000 @@ -778,14 +778,14 @@ purple_roomlist_set_fields(js->roomlist, fields); - purple_request_input_with_hint(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), + purple_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), _("Select a conference server to query"), js->chat_servers ? js->chat_servers->data : NULL, FALSE, FALSE, NULL, _("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb), _("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb), purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, js); + js); return js->roomlist; }
--- a/libpurple/protocols/jabber/jabber.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Nov 17 00:12:30 2007 +0000 @@ -1029,21 +1029,21 @@ cbdata->who = g_strdup(from); if(js->registration) - purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"), + purple_request_fields(js->gc, _("Register New XMPP Account"), _("Register New XMPP Account"), instructions, fields, _("Register"), G_CALLBACK(jabber_register_cb), _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), purple_connection_get_account(js->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_REGISTER, cbdata); + cbdata); else { char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from) :g_strdup_printf(_("Register New Account at %s"), from); - purple_request_fields_with_hint(js->gc, title, + purple_request_fields(js->gc, title, title, instructions, fields, registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb), _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), purple_connection_get_account(js->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_REGISTER, cbdata); + cbdata); g_free(title); } @@ -1740,12 +1740,12 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(js->gc, _("Change XMPP Password"), + purple_request_fields(js->gc, _("Change XMPP Password"), _("Change XMPP Password"), _("Please enter your new password"), fields, _("OK"), G_CALLBACK(jabber_password_change_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, js); + js); } GList *jabber_actions(PurplePlugin *plugin, gpointer context)
--- a/libpurple/protocols/jabber/presence.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Sat Nov 17 00:12:30 2007 +0000 @@ -512,7 +512,7 @@ if((chat = jabber_chat_find(js, jid->node, jid->domain))) { chat->config_dialog_type = PURPLE_REQUEST_ACTION; chat->config_dialog_handle = - purple_request_action_with_hint(js->gc, + purple_request_action(js->gc, _("Create New Room"), _("Create New Room"), _("You are creating a new room. Would" @@ -520,7 +520,7 @@ " accept the default settings?"), /* Default Action */ 1, purple_connection_get_account(js->gc), NULL, chat->conv, - PURPLE_REQUEST_UI_HINT_CONV, chat, 2, + chat, 2, _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); }
--- a/libpurple/protocols/jabber/si.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/si.c Sat Nov 17 00:12:30 2007 +0000 @@ -870,9 +870,9 @@ purple_request_fields_add_group(fields, group); - purple_request_fields_with_hint(jsx->js->gc, _("Select a Resource"), msg, NULL, fields, + purple_request_fields(jsx->js->gc, _("Select a Resource"), msg, NULL, fields, _("Send File"), G_CALLBACK(resource_select_ok_cb), _("Cancel"), G_CALLBACK(resource_select_cancel_cb), - jsx->js->gc->account, xfer->who, NULL, PURPLE_REQUEST_UI_HINT_XFER, xfer); + jsx->js->gc->account, xfer->who, NULL, xfer); g_free(msg); }
--- a/libpurple/protocols/jabber/usermood.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/usermood.c Sat Nov 17 00:12:30 2007 +0000 @@ -194,14 +194,14 @@ FALSE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(gc, _("Edit User Mood"), + purple_request_fields(gc, _("Edit User Mood"), _("Edit User Mood"), _("Please select your mood from the list."), fields, _("Set"), G_CALLBACK(do_mood_set_from_fields), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc); }
--- a/libpurple/protocols/jabber/usernick.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/usernick.c Sat Nov 17 00:12:30 2007 +0000 @@ -73,10 +73,10 @@ oldnickname = xmlnode_get_data(nick); } - purple_request_input_with_hint(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."), + purple_request_input(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."), _("This information is visible to all contacts on your contact list, so choose something appropriate."), oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL, - purple_connection_get_account(js->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, js); + purple_connection_get_account(js->gc), NULL, NULL, js); g_free(oldnickname); }
--- a/libpurple/protocols/jabber/xdata.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/jabber/xdata.c Sat Nov 17 00:12:30 2007 +0000 @@ -395,11 +395,11 @@ if((x = xmlnode_get_child(packet, "instructions"))) instructions = xmlnode_get_data(x); - handle = purple_request_fields_with_hint(js->gc, title, title, instructions, fields, + handle = purple_request_fields(js->gc, title, title, instructions, fields, _("OK"), G_CALLBACK(jabber_x_data_ok_cb), _("Cancel"), G_CALLBACK(jabber_x_data_cancel_cb), purple_connection_get_account(js->gc), /* XXX Do we have a who here? */ NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, data); + data); g_free(title); g_free(instructions);
--- a/libpurple/protocols/msn/dialog.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/msn/dialog.c Sat Nov 17 00:12:30 2007 +0000 @@ -135,9 +135,9 @@ passport); } - purple_request_action_with_hint(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE, + purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), data->who, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, data, 2, + data, 2, _("Yes"), G_CALLBACK(msn_add_cb), _("No"), G_CALLBACK(msn_rem_cb));
--- a/libpurple/protocols/msn/msn.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sat Nov 17 00:12:30 2007 +0000 @@ -283,14 +283,14 @@ gc = (PurpleConnection *) action->context; - purple_request_input_with_hint(gc, NULL, _("Set your friendly name."), + purple_request_input(gc, NULL, _("Set your friendly name."), _("This is the name that other MSN buddies will " "see you as."), purple_connection_get_display_name(gc), FALSE, FALSE, NULL, _("OK"), G_CALLBACK(msn_act_id), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void @@ -302,12 +302,12 @@ gc = (PurpleConnection *) action->context; session = gc->proto_data; - purple_request_input_with_hint(gc, NULL, _("Set your home phone number."), NULL, + purple_request_input(gc, NULL, _("Set your home phone number."), NULL, msn_user_get_home_phone(session->user), FALSE, FALSE, NULL, _("OK"), G_CALLBACK(msn_set_home_phone_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void @@ -319,12 +319,12 @@ gc = (PurpleConnection *) action->context; session = gc->proto_data; - purple_request_input_with_hint(gc, NULL, _("Set your work phone number."), NULL, + purple_request_input(gc, NULL, _("Set your work phone number."), NULL, msn_user_get_work_phone(session->user), FALSE, FALSE, NULL, _("OK"), G_CALLBACK(msn_set_work_phone_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void @@ -336,12 +336,12 @@ gc = (PurpleConnection *) action->context; session = gc->proto_data; - purple_request_input_with_hint(gc, NULL, _("Set your mobile phone number."), NULL, + purple_request_input(gc, NULL, _("Set your mobile phone number."), NULL, msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL, _("OK"), G_CALLBACK(msn_set_mobile_phone_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void @@ -351,13 +351,13 @@ gc = (PurpleConnection *) action->context; - purple_request_action_with_hint(gc, NULL, _("Allow MSN Mobile pages?"), + purple_request_action(gc, NULL, _("Allow MSN Mobile pages?"), _("Do you want to allow or disallow people on " "your buddy list to send you MSN Mobile pages " "to your cell phone or other mobile device?"), -1, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc, 3, + gc, 3, _("Allow"), G_CALLBACK(enable_msn_pages_cb), _("Disallow"), G_CALLBACK(disable_msn_pages_cb), _("Cancel"), NULL); @@ -401,12 +401,12 @@ data->gc = gc; data->passport = buddy->name; - purple_request_input_with_hint(gc, NULL, _("Send a mobile message."), NULL, + purple_request_input(gc, NULL, _("Send a mobile message."), NULL, NULL, TRUE, FALSE, NULL, _("Page"), G_CALLBACK(send_to_mobile_cb), _("Close"), G_CALLBACK(close_mobile_page_cb), purple_connection_get_account(gc), purple_buddy_get_name(buddy), NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, data); + data); } static gboolean
--- a/libpurple/protocols/novell/novell.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Sat Nov 17 00:12:30 2007 +0000 @@ -1921,10 +1921,10 @@ /* Prompt the user */ gc = purple_account_get_connection(user->client_data); - purple_request_action_with_hint(gc, title, primary, secondary, + purple_request_action(gc, title, primary, secondary, PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), name, NULL, - PURPLE_REQUEST_UI_HINT_CONV, parms, 2, + parms, 2, _("Yes"), G_CALLBACK(_join_conference_cb), _("No"), G_CALLBACK(_reject_conference_cb)); @@ -2175,7 +2175,7 @@ if (server == NULL || *server == '\0') { /* TODO: Would be nice to prompt if not set! - * purple_request_fields_with_hint(gc, _("Server Address"),...); + * purple_request_fields(gc, _("Server Address"),...); */ /* ...but for now just error out with a nice message. */
--- a/libpurple/protocols/oscar/oscar.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Nov 17 00:12:30 2007 +0000 @@ -1444,13 +1444,13 @@ purple_debug_info("oscar", "Got SecurID request\n"); primary = g_strdup_printf("Enter the SecurID key for %s.", purple_account_get_username(account)); - purple_request_input_with_hint(gc, NULL, _("Enter SecurID"), primary, + purple_request_input(gc, NULL, _("Enter SecurID"), primary, _("Enter the 6 digit number from the digital display."), FALSE, FALSE, NULL, _("_OK"), G_CALLBACK(purple_parse_auth_securid_request_yes_cb), _("_Cancel"), G_CALLBACK(purple_parse_auth_securid_request_no_cb), account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); g_free(primary); return 1; @@ -2237,12 +2237,12 @@ data->gc = gc; data->name = g_strdup(name); - purple_request_input_with_hint(data->gc, NULL, _("Authorization Request Message:"), + purple_request_input(data->gc, NULL, _("Authorization Request Message:"), NULL, _("Please authorize me!"), TRUE, FALSE, NULL, _("_OK"), G_CALLBACK(purple_auth_request), _("_Cancel"), G_CALLBACK(purple_auth_dontrequest), purple_connection_get_account(gc), name, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, data); + data); } @@ -2286,12 +2286,12 @@ purple_auth_dontgrant_msgprompt(gpointer cbdata) { struct name_data *data = cbdata; - purple_request_input_with_hint(data->gc, NULL, _("Authorization Denied Message:"), + purple_request_input(data->gc, NULL, _("Authorization Denied Message:"), NULL, _("No reason given."), TRUE, FALSE, NULL, _("_OK"), G_CALLBACK(purple_auth_dontgrant), _("_Cancel"), G_CALLBACK(oscar_free_name_data), purple_connection_get_account(data->gc), data->name, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, data); + data); } /* When someone sends you buddies */ @@ -2472,12 +2472,12 @@ data->name = g_strdup(text[i*2+1]); data->nick = g_strdup(text[i*2+2]); - purple_request_action_with_hint(gc, NULL, message, + purple_request_action(gc, NULL, message, _("Do you want to add this buddy " "to your buddy list?"), PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), data->name, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, data, 2, + data, 2, _("_Add"), G_CALLBACK(purple_icq_buddyadd), _("_Decline"), G_CALLBACK(oscar_free_name_data)); g_free(message); @@ -5231,10 +5231,10 @@ data->name = g_strdup(sn); data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL); - purple_request_yes_no_with_hint(gc, NULL, _("Authorization Given"), dialog_msg, + purple_request_yes_no(gc, NULL, _("Authorization Given"), dialog_msg, PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), sn, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, data, + data, G_CALLBACK(purple_icq_buddyadd), G_CALLBACK(oscar_free_name_data)); g_free(dialog_msg); @@ -5930,12 +5930,12 @@ data->nick = g_strdup(purple_buddy_get_alias_only(buddy)); title = g_strdup_printf(_("Buddy Comment for %s"), data->name); - purple_request_input_with_hint(gc, title, _("Buddy Comment:"), NULL, + purple_request_input(gc, title, _("Buddy Comment:"), NULL, comment_utf8, TRUE, FALSE, NULL, _("_OK"), G_CALLBACK(oscar_ssi_editcomment), _("_Cancel"), G_CALLBACK(oscar_free_name_data), purple_connection_get_account(gc), data->name, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, data); + data); g_free(title); g_free(comment); @@ -5980,13 +5980,13 @@ buf = g_strdup_printf(_("You have selected to open a Direct IM connection with %s."), buddy->name); - purple_request_action_with_hint(gc, NULL, buf, + purple_request_action(gc, NULL, buf, _("Because this reveals your IP address, it " "may be considered a security risk. Do you " "wish to continue?"), 0, purple_connection_get_account(gc), data->who, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, data, 2, + data, 2, _("C_onnect"), G_CALLBACK(oscar_ask_directim_yes_cb), _("_Cancel"), G_CALLBACK(oscar_ask_directim_no_cb)); g_free(buf); @@ -6138,12 +6138,12 @@ purple_request_fields_add_group(fields, g); - purple_request_fields_with_hint(gc, _("ICQ Privacy Options"), _("ICQ Privacy Options"), + purple_request_fields(gc, _("ICQ Privacy Options"), _("ICQ Privacy Options"), NULL, fields, _("OK"), G_CALLBACK(oscar_icq_privacy_opts), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void oscar_format_screenname(PurpleConnection *gc, const char *nick) { @@ -6211,12 +6211,12 @@ static void oscar_show_change_email(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input_with_hint(gc, NULL, _("Change Address To:"), NULL, NULL, + purple_request_input(gc, NULL, _("Change Address To:"), NULL, NULL, FALSE, FALSE, NULL, _("_OK"), G_CALLBACK(oscar_change_email), _("_Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void oscar_show_awaitingauth(PurplePluginAction *action) @@ -6278,7 +6278,7 @@ static void oscar_show_find_email(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input_with_hint(gc, _("Find Buddy by E-Mail"), + purple_request_input(gc, _("Find Buddy by E-Mail"), _("Search for a buddy by e-mail address"), _("Type the e-mail address of the buddy you are " "searching for."), @@ -6286,7 +6286,7 @@ _("_Search"), G_CALLBACK(search_by_email_cb), _("_Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void oscar_show_set_info(PurplePluginAction *action)
--- a/libpurple/protocols/oscar/peer.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/oscar/peer.c Sat Nov 17 00:12:30 2007 +0000 @@ -1035,7 +1035,7 @@ buf = g_strdup_printf(_("%s has just asked to directly connect to %s"), sn, purple_account_get_username(account)); - purple_request_action_with_hint(conn, NULL, buf, + purple_request_action(conn, NULL, buf, _("This requires a direct connection between " "the two computers and is necessary for IM " "Images. Because your IP address will be " @@ -1043,7 +1043,7 @@ "risk."), PURPLE_DEFAULT_ACTION_NONE, account, sn, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, conn, 2, + conn, 2, _("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb), _("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb)); }
--- a/libpurple/protocols/qq/buddy_info.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Sat Nov 17 00:12:30 2007 +0000 @@ -519,12 +519,12 @@ mid->info->qq_show = g_strdup(info->qq_show); mid->info->unknown6 = g_strdup(info->unknown6); - purple_request_fields_with_hint(gc, _("Modify my information"), + purple_request_fields(gc, _("Modify my information"), _("Modify my information"), NULL, fields, _("Update my information"), G_CALLBACK(modify_info_ok_cb), _("Cancel"), G_CALLBACK(modify_info_cancel_cb), purple_connection_get_account(gc), NULL, NULL, - "account", mid); + mid); } }
--- a/libpurple/protocols/qq/buddy_opt.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/buddy_opt.c Sat Nov 17 00:12:30 2007 +0000 @@ -209,11 +209,11 @@ msg2 = g_strdup(_("Input your reason:")); nombre = uid_to_purple_name(uid); - purple_request_input_with_hint(gc, _("Reject request"), msg1, msg2, + purple_request_input(gc, _("Reject request"), msg1, msg2, _("Sorry, you are not my type..."), TRUE, FALSE, NULL, _("Reject"), G_CALLBACK(_qq_reject_add_request_real), _("Cancel"), NULL, purple_connection_get_account(gc), nombre, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, g2); + g2); g_free(nombre); } @@ -402,7 +402,7 @@ g->gc = gc; g->uid = for_uid; msg = g_strdup_printf(_("User %d needs authentication"), for_uid); - purple_request_input_with_hint(gc, NULL, msg, + purple_request_input(gc, NULL, msg, _("Input request here"), /* TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands */ _("Would you be my friend?"), TRUE, FALSE, NULL, _("Send"), @@ -410,7 +410,7 @@ (_qq_send_packet_add_buddy_auth_with_gc_and_uid), _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid), purple_connection_get_account(gc), nombre, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, g); + g); g_free(msg); g_free(nombre); } else { /* add OK */
--- a/libpurple/protocols/qq/group.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/group.c Sat Nov 17 00:12:30 2007 +0000 @@ -116,14 +116,14 @@ purple_roomlist_set_fields(rl, fields); purple_roomlist_set_in_progress(qd->roomlist, TRUE); - purple_request_input_with_hint(gc, _("QQ Qun"), + purple_request_input(gc, _("QQ Qun"), _("Please enter external group ID"), _("You can only search for permanent QQ groups\n"), NULL, FALSE, FALSE, NULL, _("Search"), G_CALLBACK(_qq_group_search_callback), _("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback), purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, gc); + gc); return qd->roomlist; }
--- a/libpurple/protocols/qq/group_im.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/group_im.c Sat Nov 17 00:12:30 2007 +0000 @@ -133,11 +133,11 @@ nombre = uid_to_purple_name(user_uid); - purple_request_action_with_hint(gc, _("QQ Qun Operation"), + purple_request_action(gc, _("QQ Qun Operation"), msg, reason, 2, purple_connection_get_account(gc), nombre, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g, 3, + g, 3, _("Approve"), G_CALLBACK (qq_group_approve_application_with_struct),
--- a/libpurple/protocols/qq/group_join.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/group_join.c Sat Nov 17 00:12:30 2007 +0000 @@ -132,14 +132,14 @@ g = g_new0(gc_and_uid, 1); g->gc = gc; g->uid = group->internal_group_id; - purple_request_input_with_hint(gc, NULL, msg, + purple_request_input(gc, NULL, msg, _("Input request here"), _("Would you be my friend?"), TRUE, FALSE, NULL, _("Send"), G_CALLBACK(_qq_group_join_auth_with_gc_and_id), _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid), purple_connection_get_account(gc), group->group_name_utf8, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g); + g); g_free(msg); } @@ -356,13 +356,13 @@ g->gc = gc; g->uid = internal_group_id; - purple_request_action_with_hint(gc, _("QQ Qun Operation"), + purple_request_action(gc, _("QQ Qun Operation"), _("Are you sure you want to leave this Qun?"), _ ("Note, if you are the creator, \nthis operation will eventually remove this Qun."), 1, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g, 2, _("Cancel"), + g, 2, _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid), _("Continue"), G_CALLBACK(_qq_group_exit_with_gc_and_id)); }
--- a/libpurple/protocols/qq/group_opt.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/group_opt.c Sat Nov 17 00:12:30 2007 +0000 @@ -121,9 +121,9 @@ g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0); qq_send_packet_get_info(g->gc, g->member, TRUE); /* we want to see window */ - purple_request_action_with_hint(g->gc, NULL, _("Do you want to approve the request?"), "", 2, + purple_request_action(g->gc, NULL, _("Do you want to approve the request?"), "", 2, purple_connection_get_account(g->gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g, 2, + g, 2, _("Reject"), G_CALLBACK(qq_group_reject_application_with_struct), _("Approve"), G_CALLBACK(qq_group_approve_application_with_struct)); } @@ -137,13 +137,13 @@ msg2 = g_strdup(_("Enter your reason:")); nombre = uid_to_purple_name(g->member); - purple_request_input_with_hint(g->gc, /* title */ NULL, msg1, msg2, + purple_request_input(g->gc, /* title */ NULL, msg1, msg2, _("Sorry, you are not my type..."), /* multiline */ TRUE, /* masked */ FALSE, /* hint */ NULL, _("Send"), G_CALLBACK(_qq_group_reject_application_real), _("Cancel"), G_CALLBACK(_qq_group_do_nothing_with_struct), purple_connection_get_account(g->gc), nombre, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g); + g); g_free(msg1); g_free(msg2); @@ -388,13 +388,13 @@ g->gc = gc; g->uid = internal_group_id; - purple_request_action_with_hint(gc, _("QQ Qun Operation"), + purple_request_action(gc, _("QQ Qun Operation"), _("You have successfully created a Qun"), _ ("Would you like to set up the Qun details now?"), 1, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, g, 2, + g, 2, _("Setup"), G_CALLBACK(qq_group_setup_with_gc_and_uid), _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid)); }
--- a/libpurple/protocols/qq/qq.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/qq.c Sat Nov 17 00:12:30 2007 +0000 @@ -418,9 +418,9 @@ g->gc = gc; g->uid = uid; - purple_request_action_with_hint(gc, _("Block Buddy"), + purple_request_action(gc, _("Block Buddy"), _("Are you sure you want to block this buddy?"), NULL, - 1, g, "blist", 2, + 1, g, 2, _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid), _("Block"), G_CALLBACK(qq_block_buddy_with_gc_and_uid)); @@ -471,11 +471,11 @@ static void _qq_menu_create_permanent_group(PurplePluginAction * action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input_with_hint(gc, _("Create QQ Qun"), + purple_request_input(gc, _("Create QQ Qun"), _("Input Qun name here"), _("Only QQ members can create permanent Qun"), "OpenQ", FALSE, FALSE, NULL, - _("Create"), G_CALLBACK(qq_group_create_with_name), _("Cancel"), NULL, "blist", gc); + _("Create"), G_CALLBACK(qq_group_create_with_name), _("Cancel"), NULL, gc); } */
--- a/libpurple/protocols/qq/sys_msg.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/qq/sys_msg.c Sat Nov 17 00:12:30 2007 +0000 @@ -83,10 +83,10 @@ 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, - PURPLE_REQUEST_UI_HINT_CONV, g, 2, + g, 2, _("Reject"), G_CALLBACK(qq_reject_add_request_with_gc_and_uid), _("Approve"), G_CALLBACK(qq_approve_add_request_with_gc_and_uid)); g_free(nombre); @@ -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, - PURPLE_REQUEST_UI_HINT_BUDDY, g, 2, - _("Cancel"), NULL, + g, 2, + _("Cancel"), NULL, _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid)); g_free(nombre); } @@ -165,10 +165,10 @@ g->uid = uid; /* only need to get value */ message = g_strdup_printf(_("You have been added by %s"), from); _qq_sys_msg_log_write(gc, message, from); - purple_request_action_with_hint(gc, NULL, message, + purple_request_action(gc, NULL, message, _("Would you like to add him?"), 2, purple_connection_get_account(gc), name, NULL, - PURPLE_REQUEST_UI_HINT_BUDDY, g, 3, + g, 3, _("Cancel"), NULL, _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid), _("Search"), G_CALLBACK(_qq_search_before_add_with_gc_and_uid)); @@ -239,10 +239,10 @@ 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, - PURPLE_REQUEST_UI_HINT_BUDDY, g, 3, + g, 3, _("Reject"), G_CALLBACK(qq_reject_add_request_with_gc_and_uid), _("Approve"), @@ -259,10 +259,10 @@ g2->gc = gc; g2->uid = strtol(from, NULL, 10); message = g_strdup_printf(_("%s is not in your buddy list"), from); - purple_request_action_with_hint(gc, NULL, message, + purple_request_action(gc, NULL, message, _("Would you like to add him?"), 2, purple_connection_get_account(gc), name, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, g2, 3, + g2, 3, _("Cancel"), NULL, _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid), _("Search"), G_CALLBACK(_qq_search_before_add_with_gc_and_uid));
--- a/libpurple/protocols/sametime/sametime.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Sat Nov 17 00:12:30 2007 +0000 @@ -3424,12 +3424,12 @@ " message to be sent to %s"); msg1 = g_strdup_printf(msgB, buddy->name); - purple_request_fields_with_hint(gc, _("New Conference"), + purple_request_fields(gc, _("New Conference"), msgA, msg1, fields, _("Create"), G_CALLBACK(conf_create_prompt_join), _("Cancel"), G_CALLBACK(conf_create_prompt_cancel), acct, purple_buddy_get_name(buddy), NULL, - PURPLE_REQUEST_UI_HINT_CONV, buddy); + buddy); g_free(msg1); } @@ -3510,12 +3510,12 @@ " create a new conference to invite this user to."); msg = g_strdup_printf(msgB, buddy->name); - purple_request_fields_with_hint(gc, _("Invite to Conference"), + purple_request_fields(gc, _("Invite to Conference"), msgA, msg, fields, _("Invite"), G_CALLBACK(conf_select_prompt_invite), _("Cancel"), G_CALLBACK(conf_select_prompt_cancel), acct, purple_buddy_get_name(buddy), NULL, - PURPLE_REQUEST_UI_HINT_CONV, buddy); + buddy); g_free(msg); } @@ -3683,13 +3683,13 @@ " continue logging in."); msg = g_strdup_printf(msgA, NSTR(purple_account_get_username(acct))); - purple_request_input_with_hint(gc, _("Meanwhile Connection Setup"), + purple_request_input(gc, _("Meanwhile Connection Setup"), _("No Sametime Community Server Specified"), msg, MW_PLUGIN_DEFAULT_HOST, FALSE, FALSE, NULL, _("Connect"), G_CALLBACK(prompt_host_ok_cb), _("Cancel"), G_CALLBACK(prompt_host_cancel_cb), acct, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, gc); + gc); g_free(msg); } @@ -5261,10 +5261,10 @@ title = g_strdup_printf(_("Import Sametime List for Account %s"), purple_account_get_username(account)); - purple_request_file_with_hint(gc, title, NULL, FALSE, + purple_request_file(gc, title, NULL, FALSE, G_CALLBACK(st_import_action_cb), NULL, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, gc); + gc); g_free(title); } @@ -5301,10 +5301,10 @@ title = g_strdup_printf(_("Export Sametime List for Account %s"), purple_account_get_username(account)); - purple_request_file_with_hint(gc, title, NULL, TRUE, + purple_request_file(gc, title, NULL, TRUE, G_CALLBACK(st_export_action_cb), NULL, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, gc); + gc); g_free(title); } @@ -5437,12 +5437,12 @@ " the list below to add it to your buddy list."); msg = g_strdup_printf(msgB, result->name); - purple_request_fields_with_hint(gc, _("Select Notes Address Book"), + purple_request_fields(gc, _("Select Notes Address Book"), msgA, msg, fields, _("Add Group"), G_CALLBACK(remote_group_multi_cb), _("Cancel"), G_CALLBACK(remote_group_multi_cleanup), purple_connection_get_account(gc), result->name, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, pd); + pd); g_free(msg); } @@ -5527,12 +5527,12 @@ msgB = _("Enter the name of a Notes Address Book group in the field below" " to add the group and its members to your buddy list."); - purple_request_input_with_hint(gc, _("Add Group"), msgA, msgB, NULL, + purple_request_input(gc, _("Add Group"), msgA, msgB, NULL, FALSE, FALSE, NULL, _("Add"), G_CALLBACK(remote_group_action_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc); } @@ -5652,12 +5652,12 @@ msgB = _("Enter a name or partial ID in the field below to search" " for matching users in your Sametime community."); - purple_request_input_with_hint(gc, _("User Search"), msgA, msgB, NULL, + purple_request_input(gc, _("User Search"), msgA, msgB, NULL, FALSE, FALSE, NULL, _("Search"), G_CALLBACK(search_action_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc); }
--- a/libpurple/protocols/silc/buddy.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/buddy.c Sat Nov 17 00:12:30 2007 +0000 @@ -312,9 +312,9 @@ a->hostname = strdup(hostname); a->port = port; - purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp, + purple_request_action(client->application, _("Key Agreement Request"), tmp, hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname, - NULL, PURPLE_REQUEST_UI_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), + NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); } @@ -449,11 +449,11 @@ p->client = sg->client; p->conn = sg->conn; p->client_id = client_entry->id; - purple_request_input_with_hint(gc, _("IM With Password"), NULL, + purple_request_input(gc, _("IM With Password"), NULL, _("Set IM Password"), NULL, FALSE, TRUE, NULL, _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), - gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, p); + gc->account, NULL, NULL, p); silc_client_list_free(sg->client, sg->conn, clients); } @@ -1059,10 +1059,10 @@ } /* Open file selector to select the public key. */ - purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE, + purple_request_file(r->client->application, _("Open..."), NULL, FALSE, G_CALLBACK(silcpurple_add_buddy_ask_import), G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel), - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } @@ -1072,10 +1072,10 @@ char tmp[512]; g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"), r->b->name); - purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp, + purple_request_action(r->client->application, _("Add Buddy"), tmp, _("To add the buddy you must import his/her public key. " "Press Import to import a public key."), 0, - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r, 2, + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r, 2, _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb), _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb)); } @@ -1182,7 +1182,7 @@ silc_free(fingerprint); } - purple_request_fields_with_hint(r->client->application, _("Add Buddy"), + purple_request_fields(r->client->application, _("Add Buddy"), _("Select correct user"), r->pubkey_search ? _("More than one user was found with the same public key. Select " @@ -1192,7 +1192,7 @@ fields, _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb), _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel), - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } static void
--- a/libpurple/protocols/silc/chat.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/chat.c Sat Nov 17 00:12:30 2007 +0000 @@ -303,10 +303,10 @@ 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(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, PURPLE_REQUEST_UI_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, sgc); return; } @@ -443,11 +443,11 @@ if (!channel_pubkeys || !silc_dlist_count(channel_pubkeys)) { f = purple_request_field_list_new("list", NULL); purple_request_field_group_add_field(g, f); - purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), + purple_request_fields(sg->gc, _("Channel Authentication"), _("Channel Authentication"), t, fields, _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, sgc); if (channel_pubkeys) silc_dlist_uninit(channel_pubkeys); return; @@ -480,11 +480,11 @@ } purple_request_field_list_set_multi_select(f, FALSE); - purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), + purple_request_fields(sg->gc, _("Channel Authentication"), _("Channel Authentication"), t, fields, _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, sgc); } static void @@ -615,10 +615,10 @@ g_snprintf(tmp, sizeof(tmp), _("Please enter the %s channel private group name and passphrase."), p->channel); - purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields, + purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields, _("Add"), G_CALLBACK(silcpurple_chat_prv_add), _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p); + purple_connection_get_account(gc), NULL, NULL, p); } @@ -743,12 +743,12 @@ s->channel = ch; s->sg = sg; g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit); - purple_request_input_with_hint(gc, _("User Limit"), NULL, + purple_request_input(gc, _("User Limit"), NULL, _("Set user limit on channel. Set to zero to reset user limit."), tmp, FALSE, FALSE, NULL, _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s); + purple_connection_get_account(gc), NULL, NULL, s); } static void
--- a/libpurple/protocols/silc/ops.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/ops.c Sat Nov 17 00:12:30 2007 +0000 @@ -1814,11 +1814,11 @@ return; internal->u.ask_pass = completion; internal->context = context; - purple_request_input_with_hint(gc, _("Passphrase"), NULL, + purple_request_input(gc, _("Passphrase"), NULL, _("Passphrase required"), NULL, FALSE, TRUE, NULL, _("OK"), G_CALLBACK(silc_ask_passphrase_cb), _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal); + purple_connection_get_account(gc), NULL, NULL, internal); }
--- a/libpurple/protocols/silc/pk.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/pk.c Sat Nov 17 00:12:30 2007 +0000 @@ -107,9 +107,9 @@ _("Fingerprint and babbleprint for the %s key are:\n\n" "%s\n%s\n"), entity, fingerprint, babbleprint); - purple_request_action_with_hint(gc, _("Verify Public Key"), tmp, tmp2, + purple_request_action(gc, _("Verify Public Key"), tmp, tmp2, PURPLE_DEFAULT_ACTION_NONE, - purple_connection_get_account(gc), entity, NULL, PURPLE_REQUEST_UI_HINT_BLIST, verify, 3, + purple_connection_get_account(gc), entity, NULL, verify, 3, _("Yes"), G_CALLBACK(silcpurple_verify_cb), _("No"), G_CALLBACK(silcpurple_verify_cb), _("_View..."), G_CALLBACK(silcpurple_verify_details));
--- a/libpurple/protocols/silc/silc.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Sat Nov 17 00:12:30 2007 +0000 @@ -956,7 +956,7 @@ purple_request_field_group_add_field(g, f); purple_request_fields_add_group(fields, g); - purple_request_fields_with_hint(gc, _("User Online Status Attributes"), + purple_request_fields(gc, _("User Online Status Attributes"), _("User Online Status Attributes"), _("You can let other users see your online status information " "and your personal information. Please fill the information " @@ -964,7 +964,7 @@ fields, _("OK"), G_CALLBACK(silcpurple_attrs_cb), _("Cancel"), G_CALLBACK(silcpurple_attrs_cancel), - gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc->account, NULL, NULL, gc); } static void @@ -1168,11 +1168,11 @@ purple_request_field_group_add_field(g, f); purple_request_fields_add_group(fields, g); - purple_request_fields_with_hint(gc, _("Create New SILC Key Pair"), + purple_request_fields(gc, _("Create New SILC Key Pair"), _("Create New SILC Key Pair"), NULL, fields, _("Generate Key Pair"), G_CALLBACK(silcpurple_create_keypair_cb), _("Cancel"), G_CALLBACK(silcpurple_create_keypair_cancel), - gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc->account, NULL, NULL, gc); g_strfreev(u); silc_free(hostname);
--- a/libpurple/protocols/silc/util.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/util.c Sat Nov 17 00:12:30 2007 +0000 @@ -382,10 +382,10 @@ buf = g_string_free(s, FALSE); - purple_request_action_with_hint(sg->gc, _("Public Key Information"), + purple_request_action(sg->gc, _("Public Key Information"), _("Public Key Information"), buf, 0, purple_connection_get_account(sg->gc), - NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, context, 1, _("Close"), callback); + NULL, NULL, context, 1, _("Close"), callback); g_free(buf); silc_free(fingerprint);
--- a/libpurple/protocols/silc/wb.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc/wb.c Sat Nov 17 00:12:30 2007 +0000 @@ -303,8 +303,8 @@ req->channel = channel; req->sg = sg; - purple_request_action_with_hint(sender, _("Whiteboard"), tmp, NULL, 1, - sg->account, sender->nickname, NULL, PURPLE_REQUEST_UI_HINT_BLIST, req, 2, + purple_request_action(gc, _("Whiteboard"), tmp, NULL, 1, + sg->account, sender->nickname, NULL, req, 2, _("Yes"), G_CALLBACK(silcpurple_wb_request_cb), _("No"), G_CALLBACK(silcpurple_wb_request_cb)); }
--- a/libpurple/protocols/silc10/buddy.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/buddy.c Sat Nov 17 00:12:30 2007 +0000 @@ -309,9 +309,9 @@ a->hostname = strdup(hostname); a->port = port; - purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp, + purple_request_action(client->application, _("Key Agreement Request"), tmp, hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname, - NULL, PURPLE_REQUEST_UI_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), + NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb), _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb)); } @@ -462,11 +462,11 @@ p->client = sg->client; p->conn = sg->conn; p->client_id = *clients[0]->id; - purple_request_input_with_hint(gc, _("IM With Password"), NULL, + purple_request_input(gc, _("IM With Password"), NULL, _("Set IM Password"), NULL, FALSE, TRUE, NULL, _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb), _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb), - gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, p); + gc->account, NULL, NULL, p); silc_free(clients); silc_free(nickname); @@ -1067,10 +1067,10 @@ } /* Open file selector to select the public key. */ - purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE, + purple_request_file(r->client->application, _("Open..."), NULL, FALSE, G_CALLBACK(silcpurple_add_buddy_ask_import), G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel), - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } @@ -1080,10 +1080,10 @@ char tmp[512]; g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"), r->b->name); - purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp, + purple_request_action(r->client->application, _("Add Buddy"), tmp, _("To add the buddy you must import his/her public key. " "Press Import to import a public key."), 0, - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r, 2, + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r, 2, _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb), _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb)); } @@ -1180,7 +1180,7 @@ silc_free(fingerprint); } - purple_request_fields_with_hint(r->client->application, _("Add Buddy"), + purple_request_fields(r->client->application, _("Add Buddy"), _("Select correct user"), r->pubkey_search ? _("More than one user was found with the same public key. Select " @@ -1190,7 +1190,7 @@ fields, _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb), _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel), - purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r); + purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r); } static void
--- a/libpurple/protocols/silc10/chat.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/chat.c Sat Nov 17 00:12:30 2007 +0000 @@ -288,10 +288,10 @@ 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(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, PURPLE_REQUEST_UI_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, sgc); return; } @@ -419,11 +419,11 @@ if (!channel_pubkeys) { f = purple_request_field_list_new("list", NULL); purple_request_field_group_add_field(g, f); - purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), + purple_request_fields(sg->gc, _("Channel Authentication"), _("Channel Authentication"), t, fields, _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, sgc); return; } sgc->pubkeys = silc_buffer_copy(channel_pubkeys); @@ -458,11 +458,11 @@ } purple_request_field_list_set_multi_select(f, FALSE); - purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), + purple_request_fields(sg->gc, _("Channel Authentication"), _("Channel Authentication"), t, fields, _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, sgc); silc_argument_payload_free(chpks); } @@ -595,10 +595,10 @@ g_snprintf(tmp, sizeof(tmp), _("Please enter the %s channel private group name and passphrase."), p->channel); - purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields, + purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields, _("Add"), G_CALLBACK(silcpurple_chat_prv_add), _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p); + purple_connection_get_account(gc), NULL, NULL, p); } @@ -723,12 +723,12 @@ s->channel = ch; s->sg = sg; g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit); - purple_request_input_with_hint(gc, _("User Limit"), NULL, + purple_request_input(gc, _("User Limit"), NULL, _("Set user limit on channel. Set to zero to reset user limit."), tmp, FALSE, FALSE, NULL, _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s); + purple_connection_get_account(gc), NULL, NULL, s); } static void
--- a/libpurple/protocols/silc10/ops.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/ops.c Sat Nov 17 00:12:30 2007 +0000 @@ -1291,9 +1291,9 @@ #if 0 /* XXX for now, let's not show attrs here */ if (client_entry->attrs) - purple_request_action_with_hint(gc, _("User Information"), + purple_request_action(gc, _("User Information"), _("User Information"), - buf, 1, PURPLE_REQUEST_UI_HINT_BLIST, client_entry, 2, + buf, 1, client_entry, 2, _("OK"), G_CALLBACK(silcpurple_whois_more), _("_More..."), G_CALLBACK(silcpurple_whois_more), gc->account, NULL, NULL); else @@ -1898,11 +1898,11 @@ return; internal->completion = completion; internal->context = context; - purple_request_input_with_hint(gc, _("Passphrase"), NULL, + purple_request_input(gc, _("Passphrase"), NULL, _("Passphrase required"), NULL, FALSE, TRUE, NULL, _("OK"), G_CALLBACK(silc_ask_passphrase_cb), _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal); + purple_connection_get_account(gc), NULL, NULL, internal); }
--- a/libpurple/protocols/silc10/pk.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/pk.c Sat Nov 17 00:12:30 2007 +0000 @@ -113,9 +113,9 @@ _("Fingerprint and babbleprint for the %s key are:\n\n" "%s\n%s\n"), entity, fingerprint, babbleprint); - purple_request_action_with_hint(gc, _("Verify Public Key"), tmp, tmp2, + purple_request_action(gc, _("Verify Public Key"), tmp, tmp2, PURPLE_DEFAULT_ACTION_NONE, - purple_connection_get_account(gc), entity, NULL, PURPLE_REQUEST_UI_HINT_BLIST, verify, 3, + purple_connection_get_account(gc), entity, NULL, verify, 3, _("Yes"), G_CALLBACK(silcpurple_verify_cb), _("No"), G_CALLBACK(silcpurple_verify_cb), _("_View..."), G_CALLBACK(silcpurple_verify_details));
--- a/libpurple/protocols/silc10/silc.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/silc.c Sat Nov 17 00:12:30 2007 +0000 @@ -726,7 +726,7 @@ purple_request_field_group_add_field(g, f); purple_request_fields_add_group(fields, g); - purple_request_fields_with_hint(gc, _("User Online Status Attributes"), + purple_request_fields(gc, _("User Online Status Attributes"), _("User Online Status Attributes"), _("You can let other users see your online status information " "and your personal information. Please fill the information " @@ -734,7 +734,7 @@ fields, _("OK"), G_CALLBACK(silcpurple_attrs_cb), _("Cancel"), G_CALLBACK(silcpurple_attrs_cancel), - gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc); + gc->account, NULL, NULL, gc); } static void @@ -936,14 +936,11 @@ purple_request_field_group_add_field(g, f); purple_request_fields_add_group(fields, g); - purple_request_fields_with_hint(gc, _("Create New SILC Key Pair"), - _("Create New SILC Key Pair"), NULL, - fields, _("Generate Key Pair"), - G_CALLBACK(silcpurple_create_keypair_cb), - _("Cancel"), - G_CALLBACK(silcpurple_create_keypair_cancel), - gc->account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, gc); + purple_request_fields(gc, _("Create New SILC Key Pair"), + _("Create New SILC Key Pair"), NULL, fields, + _("Generate Key Pair"), G_CALLBACK(silcpurple_create_keypair_cb), + _("Cancel"), G_CALLBACK(silcpurple_create_keypair_cancel), + gc->account, NULL, NULL, gc); g_strfreev(u); silc_free(hostname);
--- a/libpurple/protocols/silc10/util.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/util.c Sat Nov 17 00:12:30 2007 +0000 @@ -371,10 +371,10 @@ buf = g_string_free(s, FALSE); - purple_request_action_with_hint(sg->gc, _("Public Key Information"), + purple_request_action(sg->gc, _("Public Key Information"), _("Public Key Information"), buf, 0, purple_connection_get_account(sg->gc), - NULL, NULL, context, PURPLE_REQUEST_UI_HINT_BLIST, 1, _("Close"), callback); + NULL, NULL, context, 1, _("Close"), callback); g_free(buf); silc_free(fingerprint);
--- a/libpurple/protocols/silc10/wb.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/silc10/wb.c Sat Nov 17 00:12:30 2007 +0000 @@ -302,8 +302,8 @@ req->channel = channel; req->sg = sg; - purple_request_action_with_hint(sender, _("Whiteboard"), tmp, NULL, 1, - sg->account, sender->nickname, NULL, PURPLE_REQUEST_UI_HINT_CONV, req, 2, + purple_request_action(sender, _("Whiteboard"), tmp, NULL, 1, + sg->account, sender->nickname, NULL, req, 2, _("Yes"), G_CALLBACK(silcpurple_wb_request_cb), _("No"), G_CALLBACK(silcpurple_wb_request_cb)); }
--- a/libpurple/protocols/toc/toc.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/toc/toc.c Sat Nov 17 00:12:30 2007 +0000 @@ -2216,8 +2216,8 @@ g_snprintf(buf, sizeof(buf), _("%s requests you to send them a file"), ft->user); } - purple_request_accept_cancel_with_hint(ft->gc, NULL, buf, NULL, - PURPLE_DEFAULT_ACTION_NONE, PURPLE_REQUEST_UI_HINT_XFER, ft, + purple_request_accept_cancel(ft->gc, NULL, buf, NULL, + PURPLE_DEFAULT_ACTION_NONE, ft, G_CALLBACK(toc_accept_ft), G_CALLBACK(toc_reject_ft)); }
--- a/libpurple/protocols/yahoo/yahoo.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Sat Nov 17 00:12:30 2007 +0000 @@ -1027,12 +1027,12 @@ static void yahoo_buddy_add_deny_reason_cb(gpointer data) { struct yahoo_add_request *add_req = data; - purple_request_input_with_hint(add_req->gc, NULL, _("Authorization denied message:"), + purple_request_input(add_req->gc, NULL, _("Authorization denied message:"), NULL, _("No reason given."), TRUE, FALSE, NULL, _("OK"), G_CALLBACK(yahoo_buddy_add_deny_cb), _("Cancel"), G_CALLBACK(yahoo_buddy_add_deny_noreason_cb), purple_connection_get_account(add_req->gc), add_req->who, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, add_req); + add_req); } static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason) @@ -2064,9 +2064,9 @@ g_snprintf(buf, sizeof(buf), _("You have tried to ignore %s, but the " "user is on your buddy list. Clicking \"Yes\" " "will remove and ignore the buddy."), who); - purple_request_yes_no_with_hint(gc, NULL, _("Ignore buddy?"), buf, 0, + purple_request_yes_no(gc, NULL, _("Ignore buddy?"), buf, 0, gc->account, who, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, b, + b, G_CALLBACK(ignore_buddy), G_CALLBACK(keep_buddy)); break; @@ -3502,23 +3502,23 @@ static void yahoo_show_act_id(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input_with_hint(gc, NULL, _("Activate which ID?"), NULL, + purple_request_input(gc, NULL, _("Activate which ID?"), NULL, purple_connection_get_display_name(gc), FALSE, FALSE, NULL, _("OK"), G_CALLBACK(yahoo_act_id), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); + gc); } static void yahoo_show_chat_goto(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input_with_hint(gc, NULL, _("Join who in chat?"), NULL, + purple_request_input(gc, NULL, _("Join whom in chat?"), NULL, "", FALSE, FALSE, NULL, _("OK"), G_CALLBACK(yahoo_chat_goto), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, gc); + gc); } static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
--- a/libpurple/request.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/request.c Sat Nov 17 00:12:30 2007 +0000 @@ -1228,20 +1228,6 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data) { - return purple_request_input_with_hint( - handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb, - cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data); -} - -void * -purple_request_input_with_hint(void *handle, const char *title, const char *primary, - const char *secondary, const char *default_value, - gboolean multiline, gboolean masked, gchar *hint, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) -{ PurpleRequestUiOps *ops; g_return_val_if_fail(ok_text != NULL, NULL); @@ -1261,7 +1247,7 @@ ok_text, ok_cb, cancel_text, cancel_cb, account, who, conv, - ui_hint, user_data); + user_data); handles = g_list_append(handles, info); @@ -1286,34 +1272,10 @@ g_return_val_if_fail(ok_cb != NULL, NULL); va_start(args, user_data); - ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary, + ui_handle = purple_request_choice_varg(handle, title, primary, secondary, default_value, ok_text, ok_cb, cancel_text, cancel_cb, - account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, args); - va_end(args); - - return ui_handle; -} - -void * -purple_request_choice_with_hint(void *handle, const char *title, const char *primary, - const char *secondary, int default_value, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, ...) -{ - void *ui_handle; - va_list args; - - g_return_val_if_fail(ok_text != NULL, NULL); - g_return_val_if_fail(ok_cb != NULL, NULL); - - va_start(args, user_data); - ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary, - default_value, ok_text, ok_cb, - cancel_text, cancel_cb, - account, who, conv, ui_hint, user_data, args); + account, who, conv, user_data, args); va_end(args); return ui_handle; @@ -1328,20 +1290,6 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data, va_list choices) { - return purple_request_choice_varg_with_hint( - handle, title, primary, secondary, default_value, ok_text, ok_cb, - cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, choices); -} - -void * -purple_request_choice_varg_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - int default_value, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, va_list choices) -{ PurpleRequestUiOps *ops; g_return_val_if_fail(ok_text != NULL, NULL); @@ -1360,7 +1308,7 @@ ok_text, ok_cb, cancel_text, cancel_cb, account, who, conv, - ui_hint, user_data, choices); + user_data, choices); handles = g_list_append(handles, info); @@ -1382,29 +1330,9 @@ g_return_val_if_fail(action_count > 0, NULL); va_start(args, action_count); - ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary, + ui_handle = purple_request_action_varg(handle, title, primary, secondary, default_action, account, who, conv, - PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, args); - va_end(args); - - return ui_handle; -} - -void * -purple_request_action_with_hint(void *handle, const char *title, const char *primary, - const char *secondary, int default_action, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t action_count, ...) -{ - void *ui_handle; - va_list args; - - g_return_val_if_fail(action_count > 0, NULL); - - va_start(args, action_count); - ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary, - default_action, account, who, conv, - ui_hint, user_data, action_count, args); + user_data, action_count, args); va_end(args); return ui_handle; @@ -1415,19 +1343,7 @@ const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who, PurpleConversation *conv, - void *user_data, size_t action_count, va_list actions) -{ - return purple_request_action_varg_with_hint( - handle, title, primary, secondary, default_action, account, who, conv, - PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, actions); -} - -void * -purple_request_action_varg_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - int default_action, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t action_count, va_list actions) + void *user_data, size_t action_count, va_list actions) { PurpleRequestUiOps *ops; @@ -1443,7 +1359,7 @@ info->handle = handle; info->ui_handle = ops->request_action(title, primary, secondary, default_action, account, who, conv, - ui_hint, user_data, action_count, actions); + user_data, action_count, actions); handles = g_list_append(handles, info); @@ -1461,19 +1377,6 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data) { - return purple_request_fields_with_hint( - handle, title, primary, secondary, fields, ok_text, ok_cb, - cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data); -} - -void * -purple_request_fields_with_hint(void *handle, const char *title, const char *primary, - const char *secondary, PurpleRequestFields *fields, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) -{ PurpleRequestUiOps *ops; g_return_val_if_fail(fields != NULL, NULL); @@ -1492,7 +1395,7 @@ fields, ok_text, ok_cb, cancel_text, cancel_cb, account, who, conv, - ui_hint, user_data); + user_data); handles = g_list_append(handles, info); @@ -1509,17 +1412,6 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data) { - return purple_request_file_with_hint( - handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data); -} - -void * -purple_request_file_with_hint(void *handle, const char *title, const char *filename, - gboolean savedialog, - GCallback ok_cb, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) -{ PurpleRequestUiOps *ops; ops = purple_request_get_ui_ops(); @@ -1532,7 +1424,7 @@ info->handle = handle; info->ui_handle = ops->request_file(title, filename, savedialog, ok_cb, cancel_cb, - account, who, conv, ui_hint, user_data); + account, who, conv, user_data); handles = g_list_append(handles, info); return info->ui_handle; } @@ -1546,16 +1438,6 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data) { - return purple_request_folder_with_hint( - handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data); -} - -void * -purple_request_folder_with_hint(void *handle, const char *title, const char *dirname, - GCallback ok_cb, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) -{ PurpleRequestUiOps *ops; ops = purple_request_get_ui_ops(); @@ -1569,7 +1451,7 @@ info->ui_handle = ops->request_folder(title, dirname, ok_cb, cancel_cb, account, who, conv, - ui_hint, user_data); + user_data); handles = g_list_append(handles, info); return info->ui_handle; }
--- a/libpurple/request.h Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/request.h Sat Nov 17 00:12:30 2007 +0000 @@ -198,77 +198,6 @@ } PurpleRequestField; -/* - * UI hints for the request functions. These are used by libpurple. - */ - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_ACCOUNT "account" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_BLIST "blist" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_BUDDY "buddy" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_CONV "conversation" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_REGISTER "register-account" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_XFER "xfer" - - -/* - * UI hints for the request functions. These are common hints used by UIs. - * UIs can still define any hints they like, but standardization is good. - */ - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_ACCOUNTMGR "accountmgr" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_CERTMGR "certmgr" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_PLUGINMGR "pluginmgr" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_POUNCEMGR "pouncemgr" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_PREFSMGR "preferences" - -/** - * @since 2.3.0 - */ -#define PURPLE_REQUEST_UI_HINT_STATUSMGR "statusmgr" - - /** * Request UI operations. */ @@ -280,33 +209,33 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); + void *user_data); void *(*request_choice)(const char *title, const char *primary, const char *secondary, int default_value, const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, va_list choices); + void *user_data, va_list choices); void *(*request_action)(const char *title, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t action_count, + void *user_data, size_t action_count, va_list actions); void *(*request_fields)(const char *title, const char *primary, const char *secondary, PurpleRequestFields *fields, const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); + void *user_data); void *(*request_file)(const char *title, const char *filename, gboolean savedialog, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); + void *user_data); void (*close_request)(PurpleRequestType type, void *ui_handle); void *(*request_folder)(const char *title, const char *dirname, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); + void *user_data); void (*_purple_reserved1)(void); void (*_purple_reserved2)(void); @@ -1370,60 +1299,9 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_input_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - const char *default_value, - gboolean multiline, gboolean masked, gchar *hint, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, const char *primary, const char *secondary, @@ -1433,7 +1311,6 @@ const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data); -#endif /** * Prompts the user for multiple-choice input. @@ -1452,48 +1329,11 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_choice_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - int default_value, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED; - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, const char *primary, const char *secondary, @@ -1502,7 +1342,6 @@ const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data, ...) G_GNUC_NULL_TERMINATED; -#endif /** * Prompts the user for multiple-choice input. @@ -1521,48 +1360,11 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_choice_varg_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - int default_value, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, va_list choices); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, const char *primary, const char *secondary, @@ -1571,7 +1373,6 @@ const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data, va_list choices); -#endif /** * Prompts the user for an action. @@ -1588,43 +1389,6 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_action_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - int default_action, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t action_count, ...); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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 @@ -1636,15 +1400,12 @@ * 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, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data, size_t action_count, ...); -#endif /** * Prompts the user for an action. @@ -1661,45 +1422,11 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_action_varg_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - int default_action, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t action_count, - va_list actions); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, const char *primary, const char *secondary, @@ -1707,7 +1434,6 @@ PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data, size_t action_count, va_list actions); -#endif /** * Displays groups of fields for the user to fill in. @@ -1726,44 +1452,9 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_fields_with_hint(void *handle, const char *title, - const char *primary, const char *secondary, - PurpleRequestFields *fields, - const char *ok_text, GCallback ok_cb, - const char *cancel_text, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, const char *primary, const char *secondary, @@ -1772,7 +1463,6 @@ const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data); -#endif /** * Closes a request. @@ -1791,21 +1481,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, \ - ui_hint, user_data, yes_cb, no_cb) \ - purple_request_action_with_hint((handle), (title), (primary), (secondary), \ - (default_action), account, who, conv, (ui_hint), (user_data), 2, \ - _("_Yes"), (yes_cb), _("_No"), (no_cb)) - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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, \ default_action, account, who, conv, \ @@ -1813,25 +1488,9 @@ purple_request_action((handle), (title), (primary), (secondary), \ (default_action), account, who, conv, (user_data), 2, \ _("_Yes"), (yes_cb), _("_No"), (no_cb)) -#endif /** * 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, \ - ui_hint, user_data, ok_cb, cancel_cb) \ - purple_request_action_with_hint((handle), (title), (primary), (secondary), \ - (default_action), account, who, conv, (ui_hint), (user_data), 2, \ - _("_OK"), (ok_cb), _("_Cancel"), (cancel_cb)) - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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, \ default_action, account, who, conv, \ @@ -1839,25 +1498,9 @@ purple_request_action((handle), (title), (primary), (secondary), \ (default_action), account, who, conv, (user_data), 2, \ _("_OK"), (ok_cb), _("_Cancel"), (cancel_cb)) -#endif /** * 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, \ - ui_hint, user_data, accept_cb, cancel_cb) \ - purple_request_action_with_hint((handle), (title), (primary), (secondary), \ - (default_action), account, who, conv, (ui_hint), (user_data), 2, \ - _("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb)) - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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, \ default_action, account, who, conv, \ @@ -1865,7 +1508,6 @@ purple_request_action((handle), (title), (primary), (secondary), \ (default_action), account, who, conv, (user_data), 2, \ _("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb)) -#endif /** * Displays a file selector request dialog. Returns the selected filename to @@ -1883,48 +1525,15 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_file_with_hint(void *handle, const char *title, const char *filename, - gboolean savedialog, - GCallback ok_cb, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, gboolean savedialog, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data); -#endif /** * Displays a folder select dialog. Returns the selected filename to @@ -1940,44 +1549,14 @@ * @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. - * - * @since 2.3.0 - */ -void *purple_request_folder_with_hint(void *handle, const char *title, const char *dirname, - GCallback ok_cb, GCallback cancel_cb, - PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * 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 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, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, void *user_data); -#endif /*@}*/
--- a/libpurple/server.c Fri Nov 16 03:39:04 2007 +0000 +++ b/libpurple/server.c Sat Nov 17 00:12:30 2007 +0000 @@ -799,9 +799,9 @@ who, purple_account_get_username(account), name); - purple_request_accept_cancel_with_hint(gc, NULL, _("Accept chat invitation?"), buf2, + purple_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2, PURPLE_DEFAULT_ACTION_NONE, account, who, NULL, - "chat", cid, G_CALLBACK(chat_invite_accept), + cid, G_CALLBACK(chat_invite_accept), G_CALLBACK(chat_invite_reject)); } else if (plugin_return > 0)
--- a/pidgin/gtkaccount.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Nov 17 00:12:30 2007 +0000 @@ -1906,9 +1906,9 @@ purple_account_get_username(account)); purple_request_close_with_handle(account); - purple_request_action_with_hint(account, NULL, buf, NULL, 0, + purple_request_action(account, NULL, buf, NULL, 0, account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, account, 2, + account, 2, _("Delete"), delete_account_cb, _("Cancel"), NULL); g_free(buf);
--- a/pidgin/gtkblist.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkblist.c Sat Nov 17 00:12:30 2007 +0000 @@ -541,9 +541,9 @@ if (i > 1) { char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); - purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " + purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); + merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); g_free(msg); } else g_list_free(merges); @@ -638,7 +638,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) @@ -664,7 +664,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 { @@ -676,7 +676,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); @@ -703,6 +703,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"); @@ -3079,20 +3084,6 @@ !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled")); } -static void (*show_with_parent_funcs[5])(GtkWindow *parent) = -{ - NULL, - pidgin_pounces_manager_show_with_parent, - pidgin_plugin_dialog_show_with_parent, - pidgin_syslog_show_with_parent, - pidgin_dialogs_about_with_parent -}; - -static void -pidgin_blist_show_with_parent(gpointer data1, gint show_with_parent_idx, gpointer data3) -{ - show_with_parent_funcs[show_with_parent_idx](GTK_WINDOW(gtkblist->window)); -} /*************************************************** * Crap * @@ -3126,15 +3117,15 @@ /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL }, - { N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_with_parent, 1, "<Item>", NULL }, + { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 1, "<Item>", NULL }, { N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL }, - { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_blist_show_with_parent, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS }, + { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<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, pidgin_blist_show_with_parent, 3, "<Item>", NULL }, + { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL }, { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, /* Help */ @@ -3142,9 +3133,9 @@ { 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_blist_show_with_parent, 4, "<StockItem>", GTK_STOCK_ABOUT }, + { N_("/Help/_About"), NULL, pidgin_dialogs_about, 4, "<StockItem>", GTK_STOCK_ABOUT }, #else - { N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, 4, "<Item>", NULL }, + { N_("/Help/_About"), NULL, pidgin_dialogs_about, 4, "<Item>", NULL }, #endif }; @@ -5315,7 +5306,6 @@ purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/sound/method", pidgin_blist_sound_method_pref_cb, NULL); - /* Setup some purple signal handlers. */ handle = purple_accounts_get_handle(); @@ -6671,13 +6661,13 @@ static void pidgin_blist_request_add_group(void) { - purple_request_input_with_hint(NULL, _("Add Group"), NULL, + purple_request_input(NULL, _("Add Group"), NULL, _("Please enter the name of the group to be added."), NULL, FALSE, FALSE, NULL, _("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } void
--- a/pidgin/gtkcertmgr.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkcertmgr.c Sat Nov 17 00:12:30 2007 +0000 @@ -184,7 +184,7 @@ if the window gets closed unusually, such as by handle deletion */ /* TODO: Display some more information on the certificate? */ - purple_request_input_with_hint(tpm_dat, + purple_request_input(tpm_dat, _("Certificate Import"), _("Specify a hostname"), _("Type the host name this certificate is for."), @@ -197,7 +197,7 @@ _("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb), NULL, NULL, NULL, /* No account/who/conv*/ - PURPLE_REQUEST_UI_HINT_CERTMGR, crt /* Pass cert instance to callback*/ + crt /* Pass cert instance to callback*/ ); g_free(default_hostname); @@ -220,13 +220,13 @@ tls_peers_mgmt_import_cb(GtkWidget *button, gpointer data) { /* TODO: need to tell the user that we want a .PEM file! */ - purple_request_file_with_hint(tpm_dat, + purple_request_file(tpm_dat, _("Select a PEM certificate"), "certificate.pem", FALSE, /* Not a save dialog */ G_CALLBACK(tls_peers_mgmt_import_ok_cb), NULL, /* Do nothing if cancelled */ - NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, NULL );/* No account,conv,etc. */ + NULL, NULL, NULL, NULL );/* No account,conv,etc. */ } static void @@ -295,14 +295,14 @@ /* TODO: inform user that it will be a PEM? */ - purple_request_file_with_hint(tpm_dat, + purple_request_file(tpm_dat, _("PEM X.509 Certificate Export"), "certificate.pem", TRUE, /* Is a save dialog */ G_CALLBACK(tls_peers_mgmt_export_ok_cb), G_CALLBACK(tls_peers_mgmt_export_cancel_cb), NULL, NULL, NULL, /* No account,conv,etc. */ - PURPLE_REQUEST_UI_HINT_CERTMGR, crt); /* Pass the certificate on to the callback */ + crt); /* Pass the certificate on to the callback */ } static void @@ -371,11 +371,10 @@ primary = g_strdup_printf( _("Really delete certificate for %s?"), id ); - purple_request_yes_no_with_hint(tpm_dat, _("Confirm certificate delete"), + purple_request_yes_no(tpm_dat, _("Confirm certificate delete"), primary, NULL, /* Can this be NULL? */ 2, /* NO is default action */ NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CERTMGR, id, /* id ownership passed to callback */ tls_peers_mgmt_delete_confirm_cb, tls_peers_mgmt_delete_confirm_cb );
--- a/pidgin/gtkconv.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkconv.c Sat Nov 17 00:12:30 2007 +0000 @@ -1030,11 +1030,11 @@ if (*c == '/' || *c == '\\') *c = ' '; } - purple_request_file_with_hint(PIDGIN_CONVERSATION(conv), _("Save Conversation"), + purple_request_file(PIDGIN_CONVERSATION(conv), _("Save Conversation"), buf, TRUE, G_CALLBACK(savelog_writefile_cb), NULL, NULL, NULL, conv, - PURPLE_REQUEST_UI_HINT_BLIST, conv); + conv); g_free(buf); } @@ -1082,7 +1082,7 @@ PurpleBlistNode *node = cur->data; if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL))) { - pidgin_log_show_contact_with_parent(GTK_WINDOW(win->window), (PurpleContact *)node->parent); + pidgin_log_show_contact((PurpleContact *)node->parent); g_slist_free(buddies); gdk_window_set_cursor(gtkblist->window->window, NULL); gdk_window_set_cursor(win->window->window, NULL); @@ -1091,7 +1091,7 @@ } g_slist_free(buddies); - pidgin_log_show_with_parent(GTK_WINDOW(win->window), type, name, account); + pidgin_log_show(type, name, account); gdk_window_set_cursor(gtkblist->window->window, NULL); gdk_window_set_cursor(win->window->window, NULL); @@ -1237,7 +1237,7 @@ conv = pidgin_conv_window_get_active_gtkconv(win)->active_conv; - pidgin_pounce_editor_show_with_parent(GTK_WINDOW(win->window), purple_conversation_get_account(conv), + pidgin_pounce_editor_show(purple_conversation_get_account(conv), purple_conversation_get_name(conv), NULL); } @@ -2719,10 +2719,10 @@ buf = g_strdup_printf("%s.%s", purple_normalize(conv->account, conv->name), ext); - purple_request_file_with_hint(gtkconv, _("Save Icon"), buf, TRUE, + purple_request_file(gtkconv, _("Save Icon"), buf, TRUE, G_CALLBACK(saveicon_writefile_cb), NULL, conv->account, NULL, conv, - PURPLE_REQUEST_UI_HINT_BLIST, gtkconv); + gtkconv); g_free(buf); }
--- a/pidgin/gtkdebug.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkdebug.c Sat Nov 17 00:12:30 2007 +0000 @@ -36,7 +36,6 @@ #include "gtkimhtml.h" #include "gtkutils.h" #include "pidginstock.h" -#include "gtkblist.h" #ifdef HAVE_REGEX_H # include <regex.h> @@ -232,10 +231,10 @@ static void save_cb(GtkWidget *w, DebugWindow *win) { - purple_request_file_with_hint(win, _("Save Debug Log"), "purple-debug.log", TRUE, + purple_request_file(win, _("Save Debug Log"), "purple-debug.log", TRUE, G_CALLBACK(save_writefile_cb), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, win); + win); } static void @@ -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);
--- a/pidgin/gtkdialogs.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Nov 17 00:12:30 2007 +0000 @@ -336,13 +336,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; @@ -358,15 +351,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); @@ -780,7 +769,7 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(purple_get_blist(), _("New Instant Message"), + purple_request_fields(purple_get_blist(), _("New Instant Message"), NULL, _("Please enter the screen name or alias of the person " "you would like to IM."), @@ -788,7 +777,7 @@ _("OK"), G_CALLBACK(pidgin_dialogs_im_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } void @@ -919,7 +908,7 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(purple_get_blist(), _("Get User Info"), + purple_request_fields(purple_get_blist(), _("Get User Info"), NULL, _("Please enter the screen name or alias of the person " "whose info you would like to view."), @@ -927,7 +916,7 @@ _("OK"), G_CALLBACK(pidgin_dialogs_info_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static void @@ -955,7 +944,7 @@ PurpleBlistNode *node = cur->data; if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL))) { - pidgin_log_show_contact_with_parent(GTK_WINDOW(gtkblist->window), (PurpleContact *)node->parent); + pidgin_log_show_contact((PurpleContact *)node->parent); g_slist_free(buddies); pidgin_clear_cursor(gtkblist->window); g_free(username); @@ -964,7 +953,7 @@ } g_slist_free(buddies); - pidgin_log_show_with_parent(GTK_WINDOW(gtkblist->window), PURPLE_LOG_IM, username, account); + pidgin_log_show(PURPLE_LOG_IM, username, account); pidgin_clear_cursor(gtkblist->window); } @@ -1011,7 +1000,7 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields_with_hint(purple_get_blist(), _("View User Log"), + purple_request_fields(purple_get_blist(), _("View User Log"), NULL, _("Please enter the screen name or alias of the person " "whose log you would like to view."), @@ -1019,7 +1008,7 @@ _("OK"), G_CALLBACK(pidgin_dialogs_log_cb), _("Cancel"), NULL, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, NULL); + NULL); } static void @@ -1033,13 +1022,13 @@ { g_return_if_fail(contact != NULL); - purple_request_input_with_hint(NULL, _("Alias Contact"), NULL, + purple_request_input(NULL, _("Alias Contact"), NULL, _("Enter an alias for this contact."), contact->alias, FALSE, FALSE, NULL, _("Alias"), G_CALLBACK(pidgin_dialogs_alias_contact_cb), _("Cancel"), NULL, NULL, purple_contact_get_alias(contact), NULL, - PURPLE_REQUEST_UI_HINT_BLIST, contact); + contact); } static void @@ -1058,12 +1047,12 @@ secondary = g_strdup_printf(_("Enter an alias for %s."), buddy->name); - purple_request_input_with_hint(NULL, _("Alias Buddy"), NULL, + purple_request_input(NULL, _("Alias Buddy"), NULL, secondary, buddy->alias, FALSE, FALSE, NULL, _("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb), _("Cancel"), NULL, purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL, - PURPLE_REQUEST_UI_HINT_BLIST, buddy); + buddy); g_free(secondary); } @@ -1079,13 +1068,13 @@ { g_return_if_fail(chat != NULL); - purple_request_input_with_hint(NULL, _("Alias Chat"), NULL, + purple_request_input(NULL, _("Alias Chat"), NULL, _("Enter an alias for this chat."), chat->alias, FALSE, FALSE, NULL, _("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb), _("Cancel"), NULL, chat->account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, chat); + chat); } static void @@ -1127,9 +1116,9 @@ "want to continue?", contact->totalsize - 1), buddy->name, contact->totalsize - 1); - purple_request_action_with_hint(contact, NULL, _("Remove Contact"), text, 0, + purple_request_action(contact, NULL, _("Remove Contact"), text, 0, NULL, purple_contact_get_alias(contact), NULL, - PURPLE_REQUEST_UI_HINT_BLIST, contact, 2, + contact, 2, _("_Remove Contact"), G_CALLBACK(pidgin_dialogs_remove_contact_cb), _("Cancel"), NULL); @@ -1168,9 +1157,9 @@ ggp->parent = source; ggp->new_name = g_strdup(new_name); - purple_request_action_with_hint(source, NULL, _("Merge Groups"), text, 0, + purple_request_action(source, NULL, _("Merge Groups"), text, 0, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, ggp, 2, + ggp, 2, _("_Merge Groups"), G_CALLBACK(pidgin_dialogs_merge_groups_cb), _("Cancel"), G_CALLBACK(free_ggmo)); @@ -1224,9 +1213,9 @@ text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), group->name); - purple_request_action_with_hint(group, NULL, _("Remove Group"), text, 0, + purple_request_action(group, NULL, _("Remove Group"), text, 0, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, group, 2, + group, 2, _("_Remove Group"), G_CALLBACK(pidgin_dialogs_remove_group_cb), _("Cancel"), NULL); @@ -1263,9 +1252,9 @@ text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), buddy->name); - purple_request_action_with_hint(buddy, NULL, _("Remove Buddy"), text, 0, + purple_request_action(buddy, NULL, _("Remove Buddy"), text, 0, purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL, - PURPLE_REQUEST_UI_HINT_BLIST, buddy, 2, + buddy, 2, _("_Remove Buddy"), G_CALLBACK(pidgin_dialogs_remove_buddy_cb), _("Cancel"), NULL); @@ -1290,9 +1279,9 @@ text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list. Do you want to continue?"), name ? name : ""); - purple_request_action_with_hint(chat, NULL, _("Remove Chat"), text, 0, + purple_request_action(chat, NULL, _("Remove Chat"), text, 0, chat->account, NULL, NULL, - PURPLE_REQUEST_UI_HINT_BLIST, chat, 2, + chat, 2, _("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb), _("Cancel"), NULL);
--- a/pidgin/gtkdialogs.h Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkdialogs.h Sat Nov 17 00:12:30 2007 +0000 @@ -31,33 +31,18 @@ #include "conversation.h" /* Functions in gtkdialogs.c (these should actually stay in this file) */ - void pidgin_dialogs_destroy_all(void); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * @deprecated Use pidgin_dialogs_about_with_parent() instead. - */ void pidgin_dialogs_about(void); -#endif - -/** - * @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); void pidgin_dialogs_log(void); -#ifndef PURPLE_DISABLE_DEPRECATED /** * @deprecated This function is no longer used and will be removed in * Pidgin 3.0.0 unless there is sufficient demand to keep it. */ void pidgin_dialogs_alias_contact(PurpleContact *); -#endif void pidgin_dialogs_alias_buddy(PurpleBuddy *); void pidgin_dialogs_alias_chat(PurpleChat *);
--- a/pidgin/gtkimhtmltoolbar.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sat Nov 17 00:12:30 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); @@ -429,14 +427,14 @@ } toolbar->link_dialog = - purple_request_fields_with_hint(toolbar, _("Insert Link"), + purple_request_fields(toolbar, _("Insert Link"), NULL, - msg, + msg, fields, _("_Insert"), G_CALLBACK(do_insert_link_cb), _("Cancel"), G_CALLBACK(cancel_link_cb), - NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_CONV, toolbar); + NULL, NULL, NULL, + toolbar); g_free(msg); g_free(desc); } else { @@ -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;
--- a/pidgin/gtklog.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtklog.c Sat Nov 17 00:12:30 2007 +0000 @@ -321,9 +321,9 @@ data2[0] = lv->treestore; data2[1] = data[3]; /* iter */ data2[2] = log; - purple_request_action_with_hint(lv, NULL, "Delete Log?", tmp, 0, + purple_request_action(lv, NULL, "Delete Log?", tmp, 0, NULL, NULL, NULL, - "log_viewer", data2, 2, + data2, 2, _("Delete"), delete_log_cb, _("Cancel"), delete_log_cleanup_cb); g_free(tmp); @@ -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); } /****************************************************************************
--- a/pidgin/gtklog.h Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtklog.h Sat Nov 17 00:12:30 2007 +0000 @@ -52,41 +52,11 @@ }; -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * @deprecated Use pidgin_log_show_with_parent() instead. - */ + void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account); -#endif - -/** - * @since 2.3.0 - */ -void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * @deprecated pidgin_log_show_contact_with_parent() instead. - */ void pidgin_log_show_contact(PurpleContact *contact); -#endif -/** - * @since 2.3.0 - */ -void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * @deprecated Use pidgin_syslog_show_with_parent() instead. - */ void pidgin_syslog_show(void); -#endif - -/** - * @since 2.3.0 - */ -void pidgin_syslog_show_with_parent(GtkWindow *parent); /**************************************************************************/ /** @name GTK+ Log Subsystem */
--- a/pidgin/gtkplugin.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkplugin.c Sat Nov 17 00:12:30 2007 +0000 @@ -280,11 +280,11 @@ cb_data[1] = model; cb_data[2] = iter; - purple_request_action_with_hint(plugin_dialog, NULL, + purple_request_action(plugin_dialog, NULL, _("Multiple plugins will be unloaded."), tmp->str, 0, - NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_PLUGINMGR, cb_data, 2, + NULL, NULL, NULL, + cb_data, 2, _("Unload Plugins"), G_CALLBACK(plugin_unload_confirm_cb), _("Cancel"), g_free); g_string_free(tmp, TRUE); @@ -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),
--- a/pidgin/gtkplugin.h Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkplugin.h Sat Nov 17 00:12:30 2007 +0000 @@ -72,20 +72,9 @@ */ void pidgin_plugins_save(void); -#ifndef PURPLE_DISABLE_DEPRECATED /** * Shows the Plugins dialog - * - * @deprecated Use pidgin_plugin_dialog_show_with_parent() instead. */ void pidgin_plugin_dialog_show(void); -#endif - -/** - * 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_ */
--- a/pidgin/gtkpounce.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkpounce.c Sat Nov 17 00:12:30 2007 +0000 @@ -154,10 +154,10 @@ entry = (GtkWidget *)data; name = gtk_entry_get_text(GTK_ENTRY(entry)); - purple_request_file_with_hint(entry, _("Select a file"), name, FALSE, + purple_request_file(entry, _("Select a file"), name, FALSE, G_CALLBACK(pounce_update_entry_fields), NULL, NULL, NULL, NULL, - "buddy_pounce", entry); + entry); g_signal_connect_swapped(G_OBJECT(entry), "destroy", G_CALLBACK(purple_request_close_with_handle), entry); } @@ -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; @@ -531,7 +524,6 @@ gtk_window_set_title(GTK_WINDOW(window), (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce"))); gtk_window_set_role(GTK_WINDOW(window), "buddy_pounce"); gtk_container_set_border_width(GTK_CONTAINER(dialog->window), PIDGIN_HIG_BORDER); - gtk_window_set_transient_for(GTK_WINDOW(window), parent); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); @@ -1063,7 +1055,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 @@ -1073,7 +1065,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 @@ -1114,9 +1106,9 @@ pouncee = purple_pounce_get_pouncee(pounce); buf = g_strdup_printf(_("Are you sure you want to delete the pounce on %s for %s?"), pouncee, pouncer); - purple_request_action_with_hint(pounce, NULL, buf, NULL, 0, + purple_request_action(pounce, NULL, buf, NULL, 0, account, pouncee, NULL, - PURPLE_REQUEST_UI_HINT_POUNCEMGR, pounce, 2, + pounce, 2, _("Delete"), pounces_manager_delete_confirm_cb, _("Cancel"), NULL); g_free(buf); @@ -1173,7 +1165,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; } @@ -1324,12 +1316,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; @@ -1340,7 +1326,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; } @@ -1351,7 +1336,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);
--- a/pidgin/gtkpounce.h Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkpounce.h Sat Nov 17 00:12:30 2007 +0000 @@ -28,48 +28,20 @@ #include "pounce.h" -#ifndef PURPLE_DISABLE_DEPRECATED /** * Displays a New Buddy Pounce or Edit Buddy Pounce dialog. * * @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); -#endif - -/** - * 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); - -#ifndef PURPLE_DISABLE_DEPRECATED -/** - * Shows the pounces manager window. - * - * @deprecated Use pidgin_pounces_manager_show_with_parent() instead. - */ -void pidgin_pounces_manager_show(void); -#endif /** * Shows the pounces manager window. - * - * @since 2.3.0 */ -void pidgin_pounces_manager_show_with_parent(GtkWindow *parent); +void pidgin_pounces_manager_show(void); /** * Hides the pounces manager window.
--- a/pidgin/gtkprefs.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkprefs.c Sat Nov 17 00:12:30 2007 +0000 @@ -641,8 +641,7 @@ static void add_theme_button_clicked_cb(GtkWidget *widget, gpointer null) { - purple_request_file_with_hint(NULL, _("Install Theme"), NULL, FALSE, - (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL) ; + purple_request_file(NULL, _("Install Theme"), NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL) ; } static void @@ -1722,9 +1721,9 @@ if (*filename == '\0') filename = NULL; - purple_request_file_with_hint(prefs, _("Sound Selection"), filename, FALSE, + purple_request_file(prefs, _("Sound Selection"), filename, FALSE, G_CALLBACK(sound_chosen_cb), NULL, - NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR, + NULL, NULL, NULL, GINT_TO_POINTER(sound_row_sel)); }
--- a/pidgin/gtkprivacy.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkprivacy.c Sat Nov 17 00:12:30 2007 +0000 @@ -88,8 +88,6 @@ static PidginPrivacyDialog *privacy_dialog = NULL; -#define PIDGIN_REQUEST_HINT_PRIVACY "privacy" - static void rebuild_allow_list(PidginPrivacyDialog *dialog) { @@ -369,7 +367,7 @@ dialog = g_new0(PidginPrivacyDialog, 1); - dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, PIDGIN_REQUEST_HINT_PRIVACY, TRUE); + dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", TRUE); g_signal_connect(G_OBJECT(dialog->win), "delete_event", G_CALLBACK(destroy_cb), dialog); @@ -556,7 +554,7 @@ data->block = FALSE; if (name == NULL) { - purple_request_input_with_hint(account, _("Permit User"), + purple_request_input(account, _("Permit User"), _("Type a user you permit to contact you."), _("Please enter the name of the user you wish to be " "able to contact you."), @@ -564,7 +562,7 @@ _("_Permit"), G_CALLBACK(add_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data), account, name, NULL, - PIDGIN_REQUEST_HINT_PRIVACY, data); + data); } else { char *primary = g_strdup_printf(_("Allow %s to contact you?"), name); @@ -573,10 +571,10 @@ "%s to contact you?"), name); - purple_request_action_with_hint(account, _("Permit User"), primary, secondary, + purple_request_action(account, _("Permit User"), primary, secondary, 0, account, name, NULL, - PIDGIN_REQUEST_HINT_PRIVACY, data, 2, + data, 2, _("_Permit"), G_CALLBACK(confirm_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data)); @@ -598,24 +596,24 @@ data->block = TRUE; if (name == NULL) { - purple_request_input_with_hint(account, _("Block User"), + purple_request_input(account, _("Block User"), _("Type a user to block."), _("Please enter the name of the user you wish to block."), NULL, FALSE, FALSE, NULL, _("_Block"), G_CALLBACK(add_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data), account, name, NULL, - PIDGIN_REQUEST_HINT_PRIVACY, data); + data); } else { char *primary = g_strdup_printf(_("Block %s?"), name); char *secondary = g_strdup_printf(_("Are you sure you want to block %s?"), name); - purple_request_action_with_hint(account, _("Block User"), primary, secondary, + purple_request_action(account, _("Block User"), primary, secondary, 0, account, name, NULL, - PIDGIN_REQUEST_HINT_PRIVACY, data, 2, + data, 2, _("_Block"), G_CALLBACK(confirm_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data));
--- a/pidgin/gtkrequest.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkrequest.c Sat Nov 17 00:12:30 2007 +0000 @@ -80,55 +80,6 @@ } PidginRequestData; -static GtkWindow * -find_toplevel(GList *ll_toplevels, const char *role) -{ - const char *window_role = NULL; - GList *ll_itr = NULL; - - for (ll_itr = ll_toplevels ; ll_itr ; ll_itr = ll_itr->next) { - if ((window_role = gtk_window_get_role(GTK_WINDOW(ll_itr->data))) != NULL) { - if (!strcmp(window_role, role)) - return GTK_WINDOW(ll_itr->data); - } - } - - return NULL; -} - -static GtkWindow * -get_request_parent(const char *ui_hint, PidginConversation *convo) -{ - GtkWindow *toplevel = NULL; - PidginBuddyList *blist = NULL; - - if (convo) - return GTK_WINDOW(convo->win->window); - - if (strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_BLIST)) { - GList *ll_toplevels = NULL; - - ll_toplevels = gtk_window_list_toplevels(); - - if (!(toplevel = find_toplevel(ll_toplevels, ui_hint))) { - if (!strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_REGISTER)) - toplevel = find_toplevel(ll_toplevels, "account"); - else - if (!strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_XFER)) - toplevel = find_toplevel(ll_toplevels, "file transfer"); - } - - g_list_free(ll_toplevels); - } - - /* Takes care of "pidgin-statusbox" as well */ - if (!toplevel) - if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL) - return GTK_WINDOW(blist->window); - - return toplevel; -} - static void generic_response_start(PidginRequestData *data) { @@ -337,7 +288,7 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) + void *user_data) { PidginRequestData *data; GtkWidget *dialog; @@ -362,7 +313,7 @@ /* Create the dialog. */ dialog = gtk_dialog_new_with_buttons(title ? title : PIDGIN_ALERT_TITLE, - get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL), 0, + NULL, 0, text_to_stock(cancel_text), 1, text_to_stock(ok_text), 0, NULL); @@ -500,7 +451,7 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, va_list args) + void *user_data, va_list args) { PidginRequestData *data; GtkWidget *dialog; @@ -524,8 +475,6 @@ /* Create the dialog. */ data->dialog = dialog = gtk_dialog_new(); - gtk_window_set_transient_for(GTK_WINDOW(dialog), - get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL)); if (title != NULL) gtk_window_set_title(GTK_WINDOW(dialog), title); @@ -606,7 +555,7 @@ pidgin_request_action(const char *title, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data, size_t action_count, va_list actions) + void *user_data, size_t action_count, va_list actions) { PidginRequestData *data; GtkWidget *dialog; @@ -636,8 +585,6 @@ /* Create the dialog. */ data->dialog = dialog = gtk_dialog_new(); - gtk_window_set_transient_for(GTK_WINDOW(dialog), - get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL)); #if GTK_CHECK_VERSION(2,10,0) gtk_window_set_deletable(GTK_WINDOW(data->dialog), FALSE); @@ -1191,7 +1138,7 @@ const char *ok_text, GCallback ok_cb, const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) + void *user_data) { PidginRequestData *data; GtkWidget *win; @@ -1232,8 +1179,6 @@ #else /* !_WIN32 */ data->dialog = win = pidgin_create_window(title, PIDGIN_HIG_BORDER, "multifield", TRUE) ; #endif /* _WIN32 */ - gtk_window_set_transient_for(GTK_WINDOW(win), - get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL)); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(destroy_multifield_cb), data); @@ -1648,10 +1593,10 @@ if ((data->u.file.savedialog == TRUE) && (g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) { - purple_request_action_with_hint(data, NULL, _("That file already exists"), + purple_request_action(data, NULL, _("That file already exists"), _("Would you like to overwrite it?"), 0, NULL, NULL, NULL, - "pidgin-request-file", data, 2, + data, 2, _("Overwrite"), G_CALLBACK(file_yes_no_cb), _("Choose New Name"), G_CALLBACK(file_yes_no_cb)); } else @@ -1676,7 +1621,7 @@ gboolean savedialog, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) + void *user_data) { PidginRequestData *data; GtkWidget *filesel; @@ -1764,9 +1709,6 @@ g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", G_CALLBACK(file_ok_check_if_exists_cb), data); #endif /* FILECHOOSER */ - gtk_window_set_role(GTK_WINDOW(filesel), "pidgin-request-file"); - gtk_window_set_transient_for(GTK_WINDOW(filesel), - get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL)); data->dialog = filesel; gtk_widget_show(filesel); @@ -1778,7 +1720,7 @@ pidgin_request_folder(const char *title, const char *dirname, GCallback ok_cb, GCallback cancel_cb, PurpleAccount *account, const char *who, PurpleConversation *conv, - const char *ui_hint, void *user_data) + void *user_data) { PidginRequestData *data; GtkWidget *dirsel; @@ -1817,9 +1759,6 @@ g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dirsel)->ok_button), "clicked", G_CALLBACK(file_ok_check_if_exists_cb), data); #endif - gtk_window_set_role(GTK_WINDOW(dirsel), "pidgin-request-dir"); - gtk_window_set_transient_for(GTK_WINDOW(dirsel), - get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL)); data->dialog = dirsel; gtk_widget_show(dirsel);
--- a/pidgin/gtksavedstatuses.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sat Nov 17 00:12:30 2007 +0000 @@ -338,9 +338,9 @@ handle = dialog; } - purple_request_action_with_hint(handle, NULL, title, NULL, 0, + purple_request_action(handle, NULL, title, NULL, 0, NULL, NULL, NULL, - PURPLE_REQUEST_UI_HINT_STATUSMGR, sel_titles, 2, + sel_titles, 2, _("Delete"), status_window_delete_confirm_cb, _("Cancel"), status_window_delete_cancel_cb);
--- a/pidgin/gtkstatusbox.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sat Nov 17 00:12:30 2007 +0000 @@ -1586,9 +1586,9 @@ msg = g_strdup_printf(_("Are you sure you want to delete %s?"), purple_savedstatus_get_title(saved)); - purple_request_action_with_hint(saved, NULL, msg, NULL, 0, + purple_request_action(saved, NULL, msg, NULL, 0, NULL, NULL, NULL, - "pidgin-statusbox", data, 2, + data, 2, _("Delete"), tree_view_delete_current_selection_cb, _("Cancel"), NULL);
--- a/pidgin/gtkutils.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkutils.c Sat Nov 17 00:12:30 2007 +0000 @@ -1531,26 +1531,26 @@ ft = TRUE; if (im && ft) - purple_request_choice_with_hint(NULL, NULL, + purple_request_choice(NULL, NULL, _("You have dragged an image"), _("You can send this image as a file transfer, " "embed it into this message, or use it as the buddy icon for this user."), DND_FILE_TRANSFER, "OK", (GCallback)dnd_image_ok_callback, "Cancel", (GCallback)dnd_image_cancel_callback, account, who, NULL, - PURPLE_REQUEST_UI_HINT_CONV, data, + data, _("Set as buddy icon"), DND_BUDDY_ICON, _("Send image file"), DND_FILE_TRANSFER, _("Insert in message"), DND_IM_IMAGE, NULL); else if (!(im || ft)) - purple_request_yes_no_with_hint(NULL, NULL, _("You have dragged an image"), + purple_request_yes_no(NULL, NULL, _("You have dragged an image"), _("Would you like to set it as the buddy icon for this user?"), 0, account, who, NULL, - PURPLE_REQUEST_UI_HINT_CONV, data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb); + data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb); else - purple_request_choice_with_hint(NULL, NULL, + purple_request_choice(NULL, NULL, _("You have dragged an image"), (ft ? _("You can send this image as a file transfer, or use it as the buddy icon for this user.") : _("You can insert this image into this message, or use it as the buddy icon for this user")), @@ -1558,7 +1558,7 @@ "OK", (GCallback)dnd_image_ok_callback, "Cancel", (GCallback)dnd_image_cancel_callback, account, who, NULL, - PURPLE_REQUEST_UI_HINT_CONV, data, + data, _("Set as buddy icon"), DND_BUDDY_ICON, (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), NULL);
--- a/pidgin/plugins/perl/common/GtkDialogs.xs Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkDialogs.xs Sat Nov 17 00:12:30 2007 +0000 @@ -10,10 +10,6 @@ pidgin_dialogs_about() void -pidgin_dialogs_about_with_parent(parent) - void * parent - -void pidgin_dialogs_im() void
--- a/pidgin/plugins/perl/common/GtkLog.xs Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkLog.xs Sat Nov 17 00:12:30 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
--- a/pidgin/plugins/perl/common/GtkPlugin.xs Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkPlugin.xs Sat Nov 17 00:12:30 2007 +0000 @@ -11,7 +11,3 @@ void pidgin_plugin_dialog_show() - -void -pidgin_plugin_dialog_show_with_parent(parent) - void * parent
--- a/pidgin/plugins/perl/common/GtkPounce.xs Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkPounce.xs Sat Nov 17 00:12:30 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()