im.pidgin.pidgin.next.minor: b6ee8d925e8e7670de77e6283963fa151ea0ed77
rlaager at pidgin.im
rlaager at pidgin.im
Sun Oct 14 17:00:54 EDT 2007
-----------------------------------------------------------------
Revision: b6ee8d925e8e7670de77e6283963fa151ea0ed77
Ancestor: 85f6cb243c8988a4759121091817cb55b63be7ba
Author: rlaager at pidgin.im
Date: 2007-10-14T20:53:40
Branch: im.pidgin.pidgin.next.minor
Modified files:
finch/gntaccount.c finch/gntblist.c finch/gntcertmgr.c
finch/gntconn.c finch/gntplugin.c finch/gntpounce.c
finch/gntprefs.c finch/gntstatus.c libpurple/account.c
libpurple/certificate.c libpurple/conversation.c
libpurple/ft.c libpurple/plugins/autoaccept.c
libpurple/plugins/buddynote.c libpurple/plugins/idle.c
libpurple/plugins/offlinemsg.c 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/jabber/usernick.c
libpurple/protocols/jabber/xdata.c
libpurple/protocols/msn/dialog.c
libpurple/protocols/msn/msn.c
libpurple/protocols/novell/novell.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/peer.c
libpurple/protocols/qq/buddy_opt.c
libpurple/protocols/qq/group.c
libpurple/protocols/qq/group_im.c
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/sys_msg.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/chat.c
libpurple/protocols/silc10/ops.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/request.c
libpurple/request.h pidgin/gtkaccount.c pidgin/gtkblist.c
pidgin/gtkcertmgr.c pidgin/gtkconv.c pidgin/gtkdebug.c
pidgin/gtkdialogs.c pidgin/gtkimhtmltoolbar.c
pidgin/gtkplugin.c pidgin/gtkpounce.c pidgin/gtkprefs.c
pidgin/gtkrequest.c pidgin/gtksavedstatuses.c
pidgin/gtkutils.c
ChangeLog:
Re-namespace the #defines to all be PURPLE_REQUEST_UI_HINT_*. I see no
reason that the common UI ones need to be in a different namespace from the
ones used by libpurple.
-------------- next part --------------
============================================================
--- finch/gntaccount.c 8adb266edb8400e74b883775d96c986900ed28fa
+++ finch/gntaccount.c afbef3ab5d11c4a7881866a88dc6d9e6408c9d55
@@ -633,7 +633,7 @@ delete_account_cb(GntWidget *widget, Gnt
purple_account_get_username(account));
purple_request_action_with_hint(account, _("Delete Account"), prompt, NULL, 0,
- account, NULL, NULL, PURPLE_UI_REQUEST_HINT_ACCOUNTMGR, account, 2,
+ account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, account, 2,
_("Delete"), really_delete_account,
_("Cancel"), NULL);
g_free(prompt);
@@ -884,7 +884,7 @@ request_add(PurpleAccount *account, cons
purple_request_action_with_hint(NULL, NULL, _("Add buddy to your list?"),
buffer, PURPLE_DEFAULT_ACTION_NONE,
account, remote_user, NULL,
- PURPLE_REQUEST_HINT_BLIST, data, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, data, 2,
_("Add"), G_CALLBACK(add_user_cb),
_("Cancel"), G_CALLBACK(free_add_user_data));
g_free(buffer);
@@ -972,7 +972,7 @@ finch_request_authorize(PurpleAccount *a
widget = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL,
PURPLE_DEFAULT_ACTION_NONE,
account, remote_user, NULL,
- PURPLE_REQUEST_HINT_BLIST, aa, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, aa, 2,
_("Authorize"), authorize_and_add_cb,
_("Deny"), deny_no_add_cb);
gnt_screen_release(widget);
@@ -999,7 +999,7 @@ finch_request_authorize(PurpleAccount *a
uihandle = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL,
PURPLE_DEFAULT_ACTION_NONE,
account, remote_user, NULL,
- PURPLE_REQUEST_HINT_BLIST, user_data, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, user_data, 2,
_("Authorize"), auth_cb,
_("Deny"), deny_cb);
}
============================================================
--- finch/gntblist.c a0408c68dc476357466c493a992afa828ba4e444
+++ finch/gntblist.c 4c5667356c36d91aa36a84e9ca20286ce747992b
@@ -343,7 +343,7 @@ finch_request_add_buddy(PurpleAccount *a
_("Add"), G_CALLBACK(add_buddy_cb),
_("Cancel"), NULL,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static void
@@ -420,7 +420,7 @@ finch_request_add_chat(PurpleAccount *ac
_("You can edit more information from the context menu later."),
fields, _("Add"), G_CALLBACK(add_chat_cb), _("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static void
@@ -455,7 +455,7 @@ finch_request_add_group()
NULL, FALSE, FALSE, NULL,
_("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static PurpleBlistUiOps blist_ui_ops =
@@ -802,7 +802,7 @@ chat_components_edit(PurpleBlistNode *se
purple_request_fields_with_hint(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."),
fields, _("Edit"), G_CALLBACK(chat_components_edit_ok), _("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, chat);
+ PURPLE_REQUEST_UI_HINT_BLIST, chat);
}
static void
@@ -1004,7 +1004,7 @@ finch_blist_rename_node_cb(PurpleBlistNo
name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, node);
+ PURPLE_REQUEST_UI_HINT_BLIST, node);
g_free(prompt);
}
@@ -1096,7 +1096,7 @@ finch_blist_remove_node_cb(PurpleBlistNo
primary, sec,
1,
account, name, NULL,
- PURPLE_REQUEST_HINT_BLIST, node, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, node, 2,
_("Remove"), finch_blist_remove_node,
_("Cancel"), NULL);
g_free(primary);
@@ -2223,7 +2223,7 @@ send_im_select(GntMenuItem *item, gpoint
_("OK"), G_CALLBACK(send_im_select_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static void
@@ -2286,7 +2286,7 @@ join_chat_select(GntMenuItem *item, gpoi
_("Join"), G_CALLBACK(join_chat_select_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static void
============================================================
--- finch/gntcertmgr.c c51c1eefb35df537a731608c1669f842eadb7bd1
+++ finch/gntcertmgr.c 9d8e53c1d25f3847c219e7e0e9a3dcc25f6cda1d
@@ -90,7 +90,7 @@ tls_peers_mgmt_import_ok_cb(gpointer dat
_("OK"), G_CALLBACK(tls_peers_mgmt_import_ok2_cb),
_("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb),
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_CERTMGR, crt);
+ PURPLE_REQUEST_UI_HINT_CERTMGR, crt);
g_free(default_hostname);
} else {
gchar * secondary;
@@ -112,7 +112,7 @@ add_cert_cb(GntWidget *button, gpointer
FALSE,
G_CALLBACK(tls_peers_mgmt_import_ok_cb),
NULL,
- NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_CERTMGR, NULL );
+ NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, NULL );
}
/* Save certs in some file */
@@ -161,7 +161,7 @@ save_cert_cb(GntWidget *button, gpointer
G_CALLBACK(tls_peers_mgmt_export_ok_cb),
G_CALLBACK(purple_certificate_destroy),
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_CERTMGR, crt);
+ PURPLE_REQUEST_UI_HINT_CERTMGR, crt);
}
/* Show information about a cert */
@@ -236,7 +236,7 @@ delete_cert_cb(GntWidget *button, gpoint
purple_request_yes_no_with_hint((void *)key, _("Confirm certificate delete"),
primary, NULL,
2,
- NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_CERTMGR,
+ NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR,
g_strdup(key),
tls_peers_mgmt_delete_confirm_cb,
g_free);
============================================================
--- finch/gntconn.c 93eeb3f628bbf58b7f21e6c8addd4bd30761c2b2
+++ finch/gntconn.c 302dac505ca2eab4ebb413e89b340aaf966611e3
@@ -132,7 +132,7 @@ finch_connection_report_disconnect(Purpl
purple_request_action_with_hint(account, NULL, primary, secondary, 2,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, account, 3,
+ PURPLE_REQUEST_UI_HINT_BLIST, account, 3,
_("OK"), NULL,
_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
_("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb));
============================================================
--- finch/gntplugin.c 46e7b7902865d1bdee07176f8902ca4977f1b495
+++ finch/gntplugin.c 9af045fe8bfd3f75c85bb6346a006823ed947f58
@@ -472,6 +472,6 @@ process_pref_frame(PurplePluginPrefFrame
return purple_request_fields_with_hint(NULL, _("Preferences"), NULL, NULL, fields,
_("Save"), G_CALLBACK(finch_request_save_in_prefs), _("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_PLUGINMGR, NULL);
+ PURPLE_REQUEST_UI_HINT_PLUGINMGR, NULL);
}
============================================================
--- finch/gntpounce.c 1f7a4365f543c04aa71a6e7ed05eaa482bfb1ee0
+++ finch/gntpounce.c 1f96dd70b5066611be057457c9e1140fd5f22a52
@@ -662,7 +662,7 @@ pounces_manager_delete_cb(GntButton *but
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,
account, pouncee, NULL,
- PURPLE_UI_REQUEST_HINT_POUNCEMGR, pounce, 2,
+ PURPLE_REQUEST_UI_HINT_POUNCEMGR, pounce, 2,
_("Delete"), pounces_manager_delete_confirm_cb,
_("Cancel"), NULL);
g_free(buf);
============================================================
--- finch/gntprefs.c e2ebd939a4fbd907857f0814aa9fdeea7a2e6aa8
+++ finch/gntprefs.c 8d355b4f284ab21fff5ed1a3eabe8ad6ee80bbfe
@@ -264,6 +264,6 @@ void finch_prefs_show_all()
pref_request.window = purple_request_fields_with_hint(NULL, _("Preferences"), NULL, NULL, fields,
_("Save"), G_CALLBACK(save_cb), _("Cancel"), free_strings,
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_PREFSMGR, NULL);
+ PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL);
}
============================================================
--- finch/gntstatus.c 399cc264d4eeb0b87e1894971d0067a6a299e8f1
+++ finch/gntstatus.c 7acfee870e608ddd77d0205d70ff81fc8511a03c
@@ -140,7 +140,7 @@ ask_before_delete(GntWidget *button, gpo
purple_request_action_with_hint(saved, _("Delete Status"), ask, NULL, 0,
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_STATUSMGR, saved, 2,
+ PURPLE_REQUEST_UI_HINT_STATUSMGR, saved, 2,
_("Delete"), really_delete_status,
_("Cancel"), NULL);
g_free(ask);
============================================================
--- libpurple/account.c e79c088ec9679be676e73ae7c9e6279f506c2f60
+++ libpurple/account.c 619314d2997f1441f4a9f8524867bcd23584dab9
@@ -1015,7 +1015,7 @@ purple_account_request_password(PurpleAc
_("OK"), ok_cb,
_("Cancel"), cancel_cb,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, user_data);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, user_data);
g_free(primary);
}
@@ -1304,7 +1304,7 @@ purple_account_request_change_password(P
_("OK"), G_CALLBACK(change_password_cb),
_("Cancel"), NULL,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, account);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, account);
}
static void
@@ -1339,7 +1339,7 @@ purple_account_request_change_user_info(
_("Save"), G_CALLBACK(set_user_info_cb),
_("Cancel"), NULL,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, account);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, account);
}
void
============================================================
--- libpurple/certificate.c 0a5bab4b530dc7bb1c80c52e83ef7d0ea9a56a6d
+++ libpurple/certificate.c 55984faf73878b5f8d069c9b0b99ac7e3b29603a
@@ -572,7 +572,7 @@ x509_singleuse_start_verify (PurpleCerti
NULL, /* No account */
NULL, /* No other user */
NULL, /* No associated conversation */
- PURPLE_REQUEST_HINT_BLIST,
+ PURPLE_REQUEST_UI_HINT_BLIST,
vrq,
x509_singleuse_verify_cb,
x509_singleuse_verify_cb );
@@ -1195,7 +1195,7 @@ x509_tls_cached_user_auth(PurpleCertific
NULL, /* No account */
NULL, /* No other user */
NULL, /* No associated conversation */
- PURPLE_REQUEST_HINT_BLIST,
+ 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,
============================================================
--- libpurple/conversation.c 56795c61cde5dd4bc04a92400bda412800341e9c
+++ libpurple/conversation.c f31c0064ee683e27835bd4599dc0030c4e6f295e
@@ -1211,7 +1211,7 @@ purple_conv_send_confirm(PurpleConversat
purple_request_action_with_hint(conv, NULL, _("Send Message"), text, 0,
purple_conversation_get_account(conv), NULL, conv,
- PURPLE_REQUEST_HINT_CONV, data, 2,
+ PURPLE_REQUEST_UI_HINT_CONV, data, 2,
_("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb),
_("Cancel"), NULL);
}
============================================================
--- libpurple/ft.c 549361c9e4091c442fa63b3a8533dc7a73baa6ad
+++ libpurple/ft.c 848bf896ffa61d8cdcc8585f29b99766aa9eff01
@@ -314,7 +314,7 @@ purple_xfer_choose_file(PurpleXfer *xfer
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_HINT_XFER, xfer);
+ PURPLE_REQUEST_UI_HINT_XFER, xfer);
return 0;
}
@@ -362,7 +362,7 @@ purple_xfer_ask_recv(PurpleXfer *xfer)
purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL,
PURPLE_DEFAULT_ACTION_NONE,
xfer->account, xfer->who, NULL,
- PURPLE_REQUEST_HINT_XFER, xfer,
+ PURPLE_REQUEST_UI_HINT_XFER, xfer,
G_CALLBACK(purple_xfer_choose_file),
G_CALLBACK(cancel_recv_cb));
@@ -405,7 +405,7 @@ purple_xfer_ask_accept(PurpleXfer *xfer)
purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2,
PURPLE_DEFAULT_ACTION_NONE,
xfer->account, xfer->who, NULL,
- PURPLE_REQUEST_HINT_XFER, xfer,
+ PURPLE_REQUEST_UI_HINT_XFER, xfer,
G_CALLBACK(ask_accept_ok),
G_CALLBACK(ask_accept_cancel));
g_free(buf);
============================================================
--- libpurple/plugins/autoaccept.c 9edf85d5aaa10da650d916d5ee965ed686f94af8
+++ libpurple/plugins/autoaccept.c 30f1cccba56a4485f48b2742575d788192964c3a
@@ -164,7 +164,7 @@ set_auto_accept_settings(PurpleBlistNode
_("_Save"), G_CALLBACK(save_cb),
_("_Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_XFER, node,
+ PURPLE_REQUEST_UI_HINT_XFER, node,
_("Ask"), FT_ASK,
_("Auto Accept"), FT_ACCEPT,
_("Auto Reject"), FT_REJECT,
============================================================
--- libpurple/plugins/buddynote.c 24ac4ca65aebbf2208727c1014349b87c5f1b94c
+++ libpurple/plugins/buddynote.c 4bf7dda056cd1aff122d22750b14bd73dc8b330c
@@ -50,7 +50,7 @@ buddynote_edit_cb(PurpleBlistNode *node,
_("Save"), G_CALLBACK(do_it_cb),
_("Cancel"), G_CALLBACK(dont_do_it_cb),
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BUDDY, node);
+ PURPLE_REQUEST_UI_HINT_BUDDY, node);
}
static void
============================================================
--- libpurple/plugins/idle.c 1db5e4f5ad506c3bef70abe8eece70452d1f8f47
+++ libpurple/plugins/idle.c 3a741d24630ca0e98f73cee955474cd79f197b71
@@ -169,7 +169,7 @@ idle_action(PurplePluginAction *action)
_("_Set"), G_CALLBACK(idle_action_ok),
_("_Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, NULL);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL);
}
static void
@@ -203,7 +203,7 @@ unidle_action(PurplePluginAction *action
_("_Unset"), G_CALLBACK(unidle_action_ok),
_("_Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, NULL);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL);
}
static void
@@ -229,7 +229,7 @@ idle_all_action(PurplePluginAction *acti
_("_Set"), G_CALLBACK(idle_all_action_ok),
_("_Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, NULL);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL);
}
static void
============================================================
--- libpurple/plugins/offlinemsg.c afcd8c2b8861729955594cf171af23f4031031ec
+++ libpurple/plugins/offlinemsg.c ba0bd7c2f0eb70b201d82de067d3c7e3680385cf
@@ -161,7 +161,7 @@ sending_msg_cb(PurpleAccount *account, c
_("You can edit/delete the pounce from the `Buddy Pounces' dialog"),
1,
offline->account, offline->who, offline->conv,
- PURPLE_REQUEST_HINT_BUDDY, offline, 2,
+ PURPLE_REQUEST_UI_HINT_BUDDY, offline, 2,
_("Yes"), record_pounce,
_("No"), cancel_poune);
g_free(ask);
============================================================
--- libpurple/protocols/gg/gg.c 06f7d5ecddfb3492b6abf7b6b9a1e8daec10e332
+++ libpurple/protocols/gg/gg.c 9aabf3d50387be4855875fee747a2fc1e9fc3d75
@@ -336,7 +336,7 @@ static void ggp_action_buddylist_save(Pu
purple_request_file_with_hint(action, _("Save buddylist..."), NULL, TRUE,
G_CALLBACK(ggp_callback_buddylist_save_ok), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, gc);
+ PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
/* }}} */
@@ -350,7 +350,7 @@ static void ggp_action_buddylist_load(Pu
purple_request_file_with_hint(action, "Load buddylist from file...", NULL, FALSE,
G_CALLBACK(ggp_callback_buddylist_load_ok), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, gc);
+ PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
/* }}} */
@@ -506,7 +506,7 @@ static void ggp_register_user_dialog(Pur
_("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_HINT_REGISTER, gc);
+ PURPLE_REQUEST_UI_HINT_REGISTER, gc);
}
/* }}} */
@@ -665,7 +665,7 @@ static void ggp_find_buddies(PurplePlugi
_("OK"), G_CALLBACK(ggp_callback_find_buddies),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, gc);
+ PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
/* }}} */
@@ -802,7 +802,7 @@ static void ggp_change_passwd_dialog(Pur
fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
g_free(msg);
}
@@ -883,7 +883,7 @@ static void ggp_bmenu_add_to_chat(Purple
_("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BUDDY, gc);
+ PURPLE_REQUEST_UI_HINT_BUDDY, gc);
g_free(msg);
}
/* }}} */
============================================================
--- libpurple/protocols/jabber/auth.c 6d261743b44661507a97dff59f475b3eb6651173
+++ libpurple/protocols/jabber/auth.c 380326c493e938bc175d9253b0218361b6216eff
@@ -321,7 +321,7 @@ static void jabber_auth_start_cyrus(Jabb
purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"),
_("Plaintext Authentication"),
msg,
- 2, js->gc->account, NULL, NULL, PURPLE_REQUEST_HINT_ACCOUNT, js->gc->account,
+ 2, js->gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNT, js->gc->account,
allow_cyrus_plaintext_auth,
disallow_plaintext_auth);
g_free(msg);
@@ -512,7 +512,7 @@ jabber_auth_start(JabberStream *js, xmln
msg,
2,
purple_connection_get_account(js->gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, purple_connection_get_account(js->gc),
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc),
allow_plaintext_auth, disallow_plaintext_auth);
g_free(msg);
return;
@@ -600,7 +600,7 @@ static void auth_old_cb(JabberStream *js
_("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_HINT_ACCOUNT, purple_connection_get_account(js->gc),
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc),
allow_plaintext_auth, disallow_plaintext_auth);
return;
}
============================================================
--- libpurple/protocols/jabber/buddy.c 8290ca1df017cbc9feb537371c9d9401fde14cf3
+++ libpurple/protocols/jabber/buddy.c 5594c177cec15339d45d922addd2135cbeca4c5d
@@ -727,7 +727,7 @@ void jabber_setup_set_info(PurplePluginA
_("Save"), G_CALLBACK(jabber_format_info),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
/*---------------------------------------*/
@@ -2415,7 +2415,7 @@ static void user_search_fields_result_cb
_("Search"), G_CALLBACK(user_search_cb),
_("Cancel"), G_CALLBACK(user_search_cancel_cb),
purple_connection_get_account(js->gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, usi);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, usi);
g_free(instructions);
}
@@ -2451,7 +2451,7 @@ void jabber_user_search_begin(PurplePlug
_("Search Directory"), PURPLE_CALLBACK(jabber_user_search),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, js);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
}
============================================================
--- libpurple/protocols/jabber/chat.c 3c2dcb11960e1b06ad32c24b14bfcf9b52fba48e
+++ libpurple/protocols/jabber/chat.c c7e51495949f9368784155aecaf1924c449afa7d
@@ -785,7 +785,7 @@ PurpleRoomlist *jabber_roomlist_get_list
_("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb),
_("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb),
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, js);
+ PURPLE_REQUEST_UI_HINT_CONV, js);
return js->roomlist;
}
============================================================
--- libpurple/protocols/jabber/jabber.c 235d565883a52e2de908c2b37f2525514f38c858
+++ libpurple/protocols/jabber/jabber.c 96db8964914ecccb426304d73371ab2c10171969
@@ -1007,7 +1007,7 @@ void jabber_register_parse(JabberStream
_("Register"), G_CALLBACK(jabber_register_cb),
_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
purple_connection_get_account(js->gc), NULL, NULL,
- PURPLE_REQUEST_HINT_REGISTER, cbdata);
+ PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
else {
char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
:g_strdup_printf(_("Register New Account at %s"), from);
@@ -1016,7 +1016,7 @@ void jabber_register_parse(JabberStream
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_HINT_REGISTER, cbdata);
+ PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
g_free(title);
}
@@ -1712,7 +1712,7 @@ static void jabber_password_change(Purpl
fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, js);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
}
GList *jabber_actions(PurplePlugin *plugin, gpointer context)
============================================================
--- libpurple/protocols/jabber/presence.c efa8a61dba15884e47246ce26b71f08f2bcb6ef2
+++ libpurple/protocols/jabber/presence.c 340fc5c5618e4ce6247a9ed60d148091f4b785cc
@@ -520,7 +520,7 @@ void jabber_presence_parse(JabberStream
" accept the default settings?"),
/* Default Action */ 1,
purple_connection_get_account(js->gc), NULL, chat->conv,
- PURPLE_REQUEST_HINT_CONV, chat, 2,
+ PURPLE_REQUEST_UI_HINT_CONV, chat, 2,
_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
}
============================================================
--- libpurple/protocols/jabber/si.c 885e80a5835d8638fc509bd7d84396f788f9f139
+++ libpurple/protocols/jabber/si.c f857135e55af11478fabd56c58ceefee343dcfd9
@@ -872,7 +872,7 @@ static void jabber_si_xfer_init(PurpleXf
purple_request_fields_with_hint(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_HINT_XFER, xfer);
+ jsx->js->gc->account, xfer->who, NULL, PURPLE_REQUEST_UI_HINT_XFER, xfer);
g_free(msg);
}
============================================================
--- libpurple/protocols/jabber/usermood.c 1d4a48ea2f3595608b84db9cae7ec70c52e425c5
+++ libpurple/protocols/jabber/usermood.c 26dbe6eb2d2194ce4d3f0fcc77dcfac77fcbe363
@@ -201,7 +201,7 @@ static void do_mood_set_mood(PurplePlugi
_("Set"), G_CALLBACK(do_mood_set_from_fields),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, gc);
+ PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
============================================================
--- libpurple/protocols/jabber/usernick.c af782bef180eed61ceef6ee214f623dba7afcf4c
+++ libpurple/protocols/jabber/usernick.c 6cc4706d943a816b4b8e94c22f143b9d1f2b98bd
@@ -76,7 +76,7 @@ static void do_nick_got_own_nick_cb(Jabb
purple_request_input_with_hint(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_HINT_BLIST, js);
+ purple_connection_get_account(js->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, js);
g_free(oldnickname);
}
============================================================
--- libpurple/protocols/jabber/xdata.c 8aad9aad949491bfe38f793be60704f014e792aa
+++ libpurple/protocols/jabber/xdata.c b9bba1096eb1e5c586cd1ec23519c782b6f5b12d
@@ -399,7 +399,7 @@ void *jabber_x_data_request_with_actions
_("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_HINT_ACCOUNT, data);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, data);
g_free(title);
g_free(instructions);
============================================================
--- libpurple/protocols/msn/dialog.c 72e558798ddbd8c7dd599037fac0f41708274325
+++ libpurple/protocols/msn/dialog.c d46641d295c65f151d7e7f582369bc9f99bbfadf
@@ -137,7 +137,7 @@ msn_show_sync_issue(MsnSession *session,
purple_request_action_with_hint(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE,
purple_connection_get_account(gc), data->who, NULL,
- PURPLE_REQUEST_HINT_BLIST, data, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, data, 2,
_("Yes"), G_CALLBACK(msn_add_cb),
_("No"), G_CALLBACK(msn_rem_cb));
============================================================
--- libpurple/protocols/msn/msn.c e5c2e164f161ccefc99d226addd7a299a1e4d66d
+++ libpurple/protocols/msn/msn.c 0c167f81f1b32222369fb16a4ab6ce5dd487dcfe
@@ -289,7 +289,7 @@ msn_show_set_friendly_name(PurplePluginA
_("OK"), G_CALLBACK(msn_act_id),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void
@@ -306,7 +306,7 @@ msn_show_set_home_phone(PurplePluginActi
_("OK"), G_CALLBACK(msn_set_home_phone_cb),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void
@@ -323,7 +323,7 @@ msn_show_set_work_phone(PurplePluginActi
_("OK"), G_CALLBACK(msn_set_work_phone_cb),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void
@@ -340,7 +340,7 @@ msn_show_set_mobile_phone(PurplePluginAc
_("OK"), G_CALLBACK(msn_set_mobile_phone_cb),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void
@@ -356,7 +356,7 @@ msn_show_set_mobile_pages(PurplePluginAc
"to your cell phone or other mobile device?"),
-1,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc, 3,
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc, 3,
_("Allow"), G_CALLBACK(enable_msn_pages_cb),
_("Disallow"), G_CALLBACK(disable_msn_pages_cb),
_("Cancel"), NULL);
@@ -405,7 +405,7 @@ show_send_to_mobile_cb(PurpleBlistNode *
_("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_HINT_ACCOUNT, data);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, data);
}
static gboolean
============================================================
--- libpurple/protocols/novell/novell.c 4df044abbdb7a114e4a18b1efa4206ea8ff2bff7
+++ libpurple/protocols/novell/novell.c ead2b83b9985b81fcfa943d4d52734619f1a19eb
@@ -1915,7 +1915,7 @@ _evt_conference_invite(NMUser * user, NM
purple_request_action_with_hint(gc, title, primary, secondary,
PURPLE_DEFAULT_ACTION_NONE,
purple_connection_get_account(gc), name, NULL,
- PURPLE_REQUEST_HINT_CONV, parms, 2,
+ PURPLE_REQUEST_UI_HINT_CONV, parms, 2,
_("Yes"), G_CALLBACK(_join_conference_cb),
_("No"), G_CALLBACK(_reject_conference_cb));
============================================================
--- libpurple/protocols/oscar/oscar.c a42165ae4498ad5709573d8a4b634f06f1a89013
+++ libpurple/protocols/oscar/oscar.c 29ffe132e36814ad5c43082868c274e4d9544376
@@ -1454,7 +1454,7 @@ purple_parse_auth_securid_request(OscarD
_("_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_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
g_free(primary);
return 1;
@@ -2246,7 +2246,7 @@ purple_auth_sendrequest(PurpleConnection
_("_OK"), G_CALLBACK(purple_auth_request),
_("_Cancel"), G_CALLBACK(purple_auth_dontrequest),
purple_connection_get_account(gc), name, NULL,
- PURPLE_REQUEST_HINT_BLIST, data);
+ PURPLE_REQUEST_UI_HINT_BLIST, data);
}
@@ -2295,7 +2295,7 @@ purple_auth_dontgrant_msgprompt(gpointer
_("_OK"), G_CALLBACK(purple_auth_dontgrant),
_("_Cancel"), G_CALLBACK(oscar_free_name_data),
purple_connection_get_account(data->gc), data->name, NULL,
- PURPLE_REQUEST_HINT_BLIST, data);
+ PURPLE_REQUEST_UI_HINT_BLIST, data);
}
/* When someone sends you buddies */
@@ -2481,7 +2481,7 @@ incomingim_chan4(OscarData *od, FlapConn
"to your buddy list?"),
PURPLE_DEFAULT_ACTION_NONE,
purple_connection_get_account(gc), data->name, NULL,
- PURPLE_REQUEST_HINT_BLIST, data, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, data, 2,
_("_Add"), G_CALLBACK(purple_icq_buddyadd),
_("_Decline"), G_CALLBACK(oscar_free_name_data));
g_free(message);
@@ -5236,7 +5236,7 @@ static int purple_ssi_authgiven(OscarDat
purple_request_yes_no_with_hint(gc, NULL, _("Authorization Given"), dialog_msg,
PURPLE_DEFAULT_ACTION_NONE,
purple_connection_get_account(gc), sn, NULL,
- PURPLE_REQUEST_HINT_BLIST, data,
+ PURPLE_REQUEST_UI_HINT_BLIST, data,
G_CALLBACK(purple_icq_buddyadd),
G_CALLBACK(oscar_free_name_data));
g_free(dialog_msg);
@@ -5937,7 +5937,7 @@ static void oscar_buddycb_edit_comment(P
_("_OK"), G_CALLBACK(oscar_ssi_editcomment),
_("_Cancel"), G_CALLBACK(oscar_free_name_data),
purple_connection_get_account(gc), data->name, NULL,
- PURPLE_REQUEST_HINT_BUDDY, data);
+ PURPLE_REQUEST_UI_HINT_BUDDY, data);
g_free(title);
g_free(comment);
@@ -5988,7 +5988,7 @@ oscar_ask_directim(gpointer object, gpoi
"wish to continue?"),
0,
purple_connection_get_account(gc), data->who, NULL,
- PURPLE_REQUEST_HINT_BUDDY, data, 2,
+ PURPLE_REQUEST_UI_HINT_BUDDY, data, 2,
_("C_onnect"), G_CALLBACK(oscar_ask_directim_yes_cb),
_("_Cancel"), G_CALLBACK(oscar_ask_directim_no_cb));
g_free(buf);
@@ -6145,7 +6145,7 @@ oscar_show_icq_privacy_opts(PurplePlugin
_("OK"), G_CALLBACK(oscar_icq_privacy_opts),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void oscar_format_screenname(PurpleConnection *gc, const char *nick) {
@@ -6218,7 +6218,7 @@ static void oscar_show_change_email(Purp
_("_OK"), G_CALLBACK(oscar_change_email),
_("_Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void oscar_show_awaitingauth(PurplePluginAction *action)
@@ -6288,7 +6288,7 @@ static void oscar_show_find_email(Purple
_("_Search"), G_CALLBACK(search_by_email_cb),
_("_Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void oscar_show_set_info(PurplePluginAction *action)
============================================================
--- libpurple/protocols/oscar/peer.c a5f086bcd6ac6cb7eb0a209ab11c45537d97135b
+++ libpurple/protocols/oscar/peer.c f7d9fc3b77db72ef61d216db75d92b754a824a6b
@@ -1041,7 +1041,7 @@ peer_connection_got_proposition(OscarDat
"risk."),
PURPLE_DEFAULT_ACTION_NONE,
account, sn, NULL,
- PURPLE_REQUEST_HINT_BUDDY, conn, 2,
+ PURPLE_REQUEST_UI_HINT_BUDDY, conn, 2,
_("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb),
_("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb));
}
============================================================
--- libpurple/protocols/qq/buddy_opt.c b335a23531f943667c0e950e5f7d68c79d69c674
+++ libpurple/protocols/qq/buddy_opt.c 4d44f4da4e4427ce55309623e570d9b5eb644fbd
@@ -213,7 +213,7 @@ void qq_reject_add_request_with_gc_and_u
_("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_HINT_BUDDY, g2);
+ PURPLE_REQUEST_UI_HINT_BUDDY, g2);
g_free(nombre);
}
@@ -410,7 +410,7 @@ void qq_process_add_buddy_reply(guint8 *
(_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_HINT_BUDDY, g);
+ PURPLE_REQUEST_UI_HINT_BUDDY, g);
g_free(msg);
g_free(nombre);
} else { /* add OK */
============================================================
--- libpurple/protocols/qq/group.c 05962ebe7b3770f4602f9632742fb6f5149d851b
+++ libpurple/protocols/qq/group.c 47c6ccf02394cdd8a8adb3acd3b3c0711c8100a1
@@ -123,7 +123,7 @@ PurpleRoomlist *qq_roomlist_get_list(Pur
_("Search"), G_CALLBACK(_qq_group_search_callback),
_("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback),
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, gc);
+ PURPLE_REQUEST_UI_HINT_CONV, gc);
return qd->roomlist;
}
============================================================
--- libpurple/protocols/qq/group_im.c bdc891cc061838072fe5cdf004b02eeaa09850e9
+++ libpurple/protocols/qq/group_im.c 1a76427ae90939931d6cb869fcaea6b20d765771
@@ -137,7 +137,7 @@ void qq_process_recv_group_im_apply_join
msg, reason,
2,
purple_connection_get_account(gc), nombre, NULL,
- PURPLE_REQUEST_HINT_CONV, g, 3,
+ PURPLE_REQUEST_UI_HINT_CONV, g, 3,
_("Approve"),
G_CALLBACK
(qq_group_approve_application_with_struct),
============================================================
--- libpurple/protocols/qq/group_join.c bbeb66a8ba4efb6a2b79f9d3da996457f245d9fb
+++ libpurple/protocols/qq/group_join.c edf63f87b6f2c3df5db4b2ae82bcfc95755a9f84
@@ -139,7 +139,7 @@ static void _qq_group_join_auth(PurpleCo
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_HINT_CONV, g);
+ PURPLE_REQUEST_UI_HINT_CONV, g);
g_free(msg);
}
@@ -362,7 +362,7 @@ void qq_group_exit(PurpleConnection *gc,
("Note, if you are the creator, \nthis operation will eventually remove this Qun."),
1,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, g, 2, _("Cancel"),
+ PURPLE_REQUEST_UI_HINT_CONV, g, 2, _("Cancel"),
G_CALLBACK(qq_do_nothing_with_gc_and_uid),
_("Continue"), G_CALLBACK(_qq_group_exit_with_gc_and_id));
}
============================================================
--- libpurple/protocols/qq/group_opt.c 425f86738350b7d38b8c29acafed7b2bca83eeb6
+++ libpurple/protocols/qq/group_opt.c 1f893ed16986f371329582e60922b86e486ed4a7
@@ -123,7 +123,7 @@ void qq_group_search_application_with_st
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_connection_get_account(g->gc), NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, g, 2,
+ PURPLE_REQUEST_UI_HINT_CONV, g, 2,
_("Reject"), G_CALLBACK(qq_group_reject_application_with_struct),
_("Approve"), G_CALLBACK(qq_group_approve_application_with_struct));
}
@@ -143,7 +143,7 @@ void qq_group_reject_application_with_st
_("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_HINT_CONV, g);
+ PURPLE_REQUEST_UI_HINT_CONV, g);
g_free(msg1);
g_free(msg2);
@@ -394,7 +394,7 @@ void qq_group_process_create_group_reply
("Would you like to set up the Qun details now?"),
1,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, g, 2,
+ PURPLE_REQUEST_UI_HINT_CONV, g, 2,
_("Setup"), G_CALLBACK(qq_group_setup_with_gc_and_uid),
_("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid));
}
============================================================
--- libpurple/protocols/qq/sys_msg.c 3efb4bac2e832c741c3a902affae644e1aca03a8
+++ libpurple/protocols/qq/sys_msg.c ded69305315c32cdc2864317c8fd0b61da31477e
@@ -86,7 +86,7 @@ static void _qq_search_before_auth_with_
purple_request_action_with_hint
(gc, NULL, _("Do you want to approve the request?"), "", 2,
purple_connection_get_account(gc), nombre, NULL,
- PURPLE_REQUEST_HINT_CONV, g, 2,
+ PURPLE_REQUEST_UI_HINT_CONV, 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);
@@ -109,7 +109,7 @@ static void _qq_search_before_add_with_g
purple_request_action_with_hint
(gc, NULL, _("Do you want to add this buddy?"), "", 2,
purple_connection_get_account(gc), nombre, NULL,
- PURPLE_REQUEST_HINT_BUDDY, g, 2,
+ PURPLE_REQUEST_UI_HINT_BUDDY, g, 2,
_("Cancel"), NULL,
_("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid));
g_free(nombre);
@@ -168,7 +168,7 @@ static void _qq_process_msg_sys_being_ad
purple_request_action_with_hint(gc, NULL, message,
_("Would you like to add him?"), 2,
purple_connection_get_account(gc), name, NULL,
- PURPLE_REQUEST_HINT_BUDDY, g, 3,
+ PURPLE_REQUEST_UI_HINT_BUDDY, 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));
@@ -242,7 +242,7 @@ static void _qq_process_msg_sys_add_cont
purple_request_action_with_hint
(gc, NULL, message, reason, 2,
purple_connection_get_account(gc), name, NULL,
- PURPLE_REQUEST_HINT_BUDDY, g, 3,
+ PURPLE_REQUEST_UI_HINT_BUDDY, g, 3,
_("Reject"),
G_CALLBACK(qq_reject_add_request_with_gc_and_uid),
_("Approve"),
@@ -262,7 +262,7 @@ static void _qq_process_msg_sys_add_cont
purple_request_action_with_hint(gc, NULL, message,
_("Would you like to add him?"), 2,
purple_connection_get_account(gc), name, NULL,
- PURPLE_REQUEST_HINT_BLIST, g2, 3,
+ PURPLE_REQUEST_UI_HINT_BLIST, 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));
============================================================
--- libpurple/protocols/sametime/sametime.c 1097dc396544ecfd87825065ddd72c6fdcf5eab3
+++ libpurple/protocols/sametime/sametime.c b7f604fa74b002e096686aca86185f5be0109774
@@ -3387,7 +3387,7 @@ static void blist_menu_conf_create(Purpl
_("Create"), G_CALLBACK(conf_create_prompt_join),
_("Cancel"), G_CALLBACK(conf_create_prompt_cancel),
acct, purple_buddy_get_name(buddy), NULL,
- PURPLE_REQUEST_HINT_CONV, buddy);
+ PURPLE_REQUEST_UI_HINT_CONV, buddy);
g_free(msg1);
}
@@ -3473,7 +3473,7 @@ static void blist_menu_conf_list(PurpleB
_("Invite"), G_CALLBACK(conf_select_prompt_invite),
_("Cancel"), G_CALLBACK(conf_select_prompt_cancel),
acct, purple_buddy_get_name(buddy), NULL,
- PURPLE_REQUEST_HINT_CONV, buddy);
+ PURPLE_REQUEST_UI_HINT_CONV, buddy);
g_free(msg);
}
@@ -3644,7 +3644,7 @@ static void prompt_host(PurpleConnection
_("Connect"), G_CALLBACK(prompt_host_ok_cb),
_("Cancel"), G_CALLBACK(prompt_host_cancel_cb),
acct, NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, gc);
+ PURPLE_REQUEST_UI_HINT_CONV, gc);
g_free(msg);
}
@@ -5218,7 +5218,7 @@ static void st_import_action(PurplePlugi
purple_request_file_with_hint(gc, title, NULL, FALSE,
G_CALLBACK(st_import_action_cb), NULL,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, gc);
+ PURPLE_REQUEST_UI_HINT_CONV, gc);
g_free(title);
}
@@ -5258,7 +5258,7 @@ static void st_export_action(PurplePlugi
purple_request_file_with_hint(gc, title, NULL, TRUE,
G_CALLBACK(st_export_action_cb), NULL,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, gc);
+ PURPLE_REQUEST_UI_HINT_CONV, gc);
g_free(title);
}
@@ -5396,7 +5396,7 @@ static void remote_group_multi(struct mw
_("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_HINT_BLIST, pd);
+ PURPLE_REQUEST_UI_HINT_BLIST, pd);
g_free(msg);
}
@@ -5486,7 +5486,7 @@ static void remote_group_action(PurplePl
_("Add"), G_CALLBACK(remote_group_action_cb),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, gc);
+ PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
@@ -5611,7 +5611,7 @@ static void search_action(PurplePluginAc
_("Search"), G_CALLBACK(search_action_cb),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, gc);
+ PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
============================================================
--- libpurple/protocols/silc/buddy.c 906196a075fa1e47a1a46a7bb95fb9764ce561d9
+++ libpurple/protocols/silc/buddy.c 15b5e8a7662e5fd929360531bafe9bf281415ec9
@@ -314,7 +314,7 @@ void silcpurple_buddy_keyagr_request(Sil
purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp,
hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname,
- NULL, PURPLE_REQUEST_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
+ NULL, PURPLE_REQUEST_UI_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
_("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
}
@@ -453,7 +453,7 @@ silcpurple_buddy_privkey(PurpleConnectio
_("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_HINT_BLIST, p);
+ gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, p);
silc_client_list_free(sg->client, sg->conn, clients);
}
@@ -1059,7 +1059,7 @@ silcpurple_add_buddy_ask_pk_cb(SilcPurpl
purple_request_file_with_hint(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_HINT_BLIST, r);
+ purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
}
@@ -1072,7 +1072,7 @@ silcpurple_add_buddy_ask_pk(SilcPurpleBu
purple_request_action_with_hint(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_HINT_BLIST, r, 2,
+ purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r, 2,
_("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb),
_("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb));
}
@@ -1189,7 +1189,7 @@ silcpurple_add_buddy_select(SilcPurpleBu
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_HINT_BLIST, r);
+ purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
}
static void
============================================================
--- libpurple/protocols/silc/chat.c 2328b849a99e839e573217aea37bdedc84a8dc6e
+++ libpurple/protocols/silc/chat.c 941c6ec20d27c10c178f9df0e4743164c5cac03e
@@ -304,7 +304,7 @@ silcpurple_chat_chpk_cb(SilcPurpleChauth
purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
G_CALLBACK(silcpurple_chat_chpk_add),
G_CALLBACK(silcpurple_chat_chpk_cancel),
- purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc);
+ purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
return;
}
@@ -445,7 +445,7 @@ void silcpurple_chat_chauth_show(SilcPur
_("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_HINT_CONV, sgc);
+ purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
if (channel_pubkeys)
silc_dlist_uninit(channel_pubkeys);
return;
@@ -480,7 +480,7 @@ void silcpurple_chat_chauth_show(SilcPur
_("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_HINT_CONV, sgc);
+ purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
}
static void
@@ -614,7 +614,7 @@ silcpurple_chat_prv(PurpleBlistNode *nod
purple_request_fields_with_hint(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_HINT_CONV, p);
+ purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p);
}
@@ -744,7 +744,7 @@ silcpurple_chat_ulimit(PurpleBlistNode *
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_HINT_CONV, s);
+ purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s);
}
static void
============================================================
--- libpurple/protocols/silc/ops.c d1712714d1c136f16b00a209745afeddb09946dc
+++ libpurple/protocols/silc/ops.c ca6816e45e0bface371cba6873508b7d4db3cb33
@@ -1814,7 +1814,7 @@ silc_ask_passphrase(SilcClient client, S
_("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_HINT_BLIST, internal);
+ purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal);
}
============================================================
--- libpurple/protocols/silc/pk.c c044f224da7972fcdab6c9297e7ebb45f858b2ef
+++ libpurple/protocols/silc/pk.c 39868de98372df549a6d084080ef6b5e29394477
@@ -109,7 +109,7 @@ static void silcpurple_verify_ask(const
purple_request_action_with_hint(gc, _("Verify Public Key"), tmp, tmp2,
PURPLE_DEFAULT_ACTION_NONE,
- purple_connection_get_account(gc), entity, NULL, PURPLE_REQUEST_HINT_BLIST, verify, 3,
+ purple_connection_get_account(gc), entity, NULL, PURPLE_REQUEST_UI_HINT_BLIST, verify, 3,
_("Yes"), G_CALLBACK(silcpurple_verify_cb),
_("No"), G_CALLBACK(silcpurple_verify_cb),
_("_View..."), G_CALLBACK(silcpurple_verify_details));
============================================================
--- libpurple/protocols/silc/silc.c bf59d12b9f6d70207c3d24a246e02b7337879ac2
+++ libpurple/protocols/silc/silc.c 7b7b6beaeb6f3b90749a6436becfea25bf63aef1
@@ -821,7 +821,7 @@ silcpurple_attrs(PurplePluginAction *act
fields,
_("OK"), G_CALLBACK(silcpurple_attrs_cb),
_("Cancel"), G_CALLBACK(silcpurple_attrs_cancel),
- gc->account, NULL, NULL, PURPLE_REQUEST_HINT_BLIST, gc);
+ gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
static void
@@ -1029,7 +1029,7 @@ silcpurple_create_keypair(PurplePluginAc
_("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_HINT_BLIST, gc);
+ gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc);
g_strfreev(u);
silc_free(hostname);
============================================================
--- libpurple/protocols/silc/util.c a1fba248e0089c8b1e6370b4e171381ab6a1dd3e
+++ libpurple/protocols/silc/util.c 36e0881f92f17b15e9753170dd5ecf6d97c24d9b
@@ -379,7 +379,7 @@ void silcpurple_show_public_key(SilcPurp
purple_request_action_with_hint(sg->gc, _("Public Key Information"),
_("Public Key Information"),
buf, 0, purple_connection_get_account(sg->gc),
- NULL, NULL, PURPLE_REQUEST_HINT_BLIST, context, 1, _("Close"), callback);
+ NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, context, 1, _("Close"), callback);
g_free(buf);
silc_free(fingerprint);
============================================================
--- libpurple/protocols/silc/wb.c e7e152d240c114de3a4828a7139156f92dd9780b
+++ libpurple/protocols/silc/wb.c d615fcef2bb068039cfd5eb5d43d0847c2627d30
@@ -300,7 +300,7 @@ silcpurple_wb_request(SilcClient client,
req->sg = sg;
purple_request_action_with_hint(gc, _("Whiteboard"), tmp, NULL, 1,
- sg->account, sender->nickname, NULL, PURPLE_REQUEST_HINT_BLIST, req, 2,
+ sg->account, sender->nickname, NULL, PURPLE_REQUEST_UI_HINT_BLIST, req, 2,
_("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
_("No"), G_CALLBACK(silcpurple_wb_request_cb));
}
============================================================
--- libpurple/protocols/silc10/buddy.c dfd70fcb00c16178f71c0789345f72e86217f219
+++ libpurple/protocols/silc10/buddy.c 83e205c1493619446455c0c89f50531a630e2444
@@ -311,7 +311,7 @@ void silcpurple_buddy_keyagr_request(Sil
purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp,
hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname,
- NULL, a, PURPLE_REQUEST_HINT_BLIST, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
+ NULL, a, PURPLE_REQUEST_UI_HINT_BLIST, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
_("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
}
@@ -466,7 +466,7 @@ silcpurple_buddy_privkey(PurpleConnectio
_("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_HINT_BLIST, p);
+ gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, p);
silc_free(clients);
silc_free(nickname);
@@ -1067,7 +1067,7 @@ silcpurple_add_buddy_ask_pk_cb(SilcPurpl
purple_request_file_with_hint(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_HINT_BLIST, r);
+ purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
}
@@ -1080,7 +1080,7 @@ silcpurple_add_buddy_ask_pk(SilcPurpleBu
purple_request_action_with_hint(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_HINT_BLIST, r, 2,
+ purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r, 2,
_("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb),
_("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb));
}
@@ -1187,7 +1187,7 @@ silcpurple_add_buddy_select(SilcPurpleBu
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_HINT_BLIST, r);
+ purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
}
static void
============================================================
--- libpurple/protocols/silc10/chat.c 0b08ca385a52de2e8d0c7779f72ffa364b4ebc12
+++ libpurple/protocols/silc10/chat.c ab5d42e410fa97fd4738d048cddcc21fca0e817b
@@ -291,7 +291,7 @@ silcpurple_chat_chpk_cb(SilcPurpleChauth
purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
G_CALLBACK(silcpurple_chat_chpk_add),
G_CALLBACK(silcpurple_chat_chpk_cancel),
- purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc);
+ purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
return;
}
@@ -423,7 +423,7 @@ void silcpurple_chat_chauth_show(SilcPur
_("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_HINT_CONV, sgc);
+ purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
return;
}
sgc->pubkeys = silc_buffer_copy(channel_pubkeys);
@@ -462,7 +462,7 @@ void silcpurple_chat_chauth_show(SilcPur
_("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_HINT_CONV, sgc);
+ purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
silc_argument_payload_free(chpks);
}
@@ -598,7 +598,7 @@ silcpurple_chat_prv(PurpleBlistNode *nod
purple_request_fields_with_hint(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_HINT_CONV, p);
+ purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p);
}
@@ -728,7 +728,7 @@ silcpurple_chat_ulimit(PurpleBlistNode *
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_HINT_CONV, s);
+ purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s);
}
static void
============================================================
--- libpurple/protocols/silc10/ops.c 6acefccaec8adada99925910de36cbcfdd429a91
+++ libpurple/protocols/silc10/ops.c e80ae39579d05d10b61ee11b1f58e9d69cb3ea41
@@ -1293,7 +1293,7 @@ silc_command_reply(SilcClient client, Si
if (client_entry->attrs)
purple_request_action_with_hint(gc, _("User Information"),
_("User Information"),
- buf, 1, PURPLE_REQUEST_HINT_BLIST, client_entry, 2,
+ buf, 1, PURPLE_REQUEST_UI_HINT_BLIST, client_entry, 2,
_("OK"), G_CALLBACK(silcpurple_whois_more),
_("_More..."), G_CALLBACK(silcpurple_whois_more), gc->account, NULL, NULL);
else
@@ -1902,7 +1902,7 @@ silc_ask_passphrase(SilcClient client, S
_("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_HINT_BLIST, internal);
+ purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal);
}
============================================================
--- libpurple/protocols/silc10/pk.c 05bbdd21288b2b41dfa930970cbcca862cc076bc
+++ libpurple/protocols/silc10/pk.c 8a81c54fa012e4d2e72225d8b175d1d8f66e9bba
@@ -115,7 +115,7 @@ static void silcpurple_verify_ask(const
purple_request_action_with_hint(gc, _("Verify Public Key"), tmp, tmp2,
PURPLE_DEFAULT_ACTION_NONE,
- purple_connection_get_account(gc), entity, NULL, verify, PURPLE_REQUEST_HINT_BLIST, 3,
+ purple_connection_get_account(gc), entity, NULL, verify, PURPLE_REQUEST_UI_HINT_BLIST, 3,
_("Yes"), G_CALLBACK(silcpurple_verify_cb),
_("No"), G_CALLBACK(silcpurple_verify_cb),
_("_View..."), G_CALLBACK(silcpurple_verify_details));
============================================================
--- libpurple/protocols/silc10/silc.c 0d1ccce40ecb957358fb5e33e757f5da292c818b
+++ libpurple/protocols/silc10/silc.c 0d0cc3526849fb52fd741590f9db2beb1dcd925f
@@ -734,7 +734,7 @@ silcpurple_attrs(PurplePluginAction *act
fields,
_("OK"), G_CALLBACK(silcpurple_attrs_cb),
_("Cancel"), G_CALLBACK(silcpurple_attrs_cancel),
- gc->account, NULL, NULL, PURPLE_REQUEST_HINT_BLIST, gc);
+ gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc);
}
static void
============================================================
--- libpurple/protocols/silc10/util.c c6ea0d7fc00fef3b563d03ea2c152ff5604b66b0
+++ libpurple/protocols/silc10/util.c 6061c85148bae9de6b2467e764574511e096d980
@@ -374,7 +374,7 @@ void silcpurple_show_public_key(SilcPurp
purple_request_action_with_hint(sg->gc, _("Public Key Information"),
_("Public Key Information"),
buf, 0, purple_connection_get_account(sg->gc),
- NULL, NULL, context, PURPLE_REQUEST_HINT_BLIST, 1, _("Close"), callback);
+ NULL, NULL, context, PURPLE_REQUEST_UI_HINT_BLIST, 1, _("Close"), callback);
g_free(buf);
silc_free(fingerprint);
============================================================
--- libpurple/protocols/silc10/wb.c eaab063d9dd2554c84b2a5cc3c54a4748c453f18
+++ libpurple/protocols/silc10/wb.c f404acdd82d963d6805180bb377cdb3943a49e93
@@ -300,7 +300,7 @@ silcpurple_wb_request(SilcClient client,
req->sg = sg;
purple_request_action_with_hint(gc, _("Whiteboard"), tmp, NULL, 1,
- sg->account, sender->nickname, NULL, PURPLE_REQUEST_HINT_CONV, req, 2,
+ sg->account, sender->nickname, NULL, PURPLE_REQUEST_UI_HINT_CONV, req, 2,
_("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
_("No"), G_CALLBACK(silcpurple_wb_request_cb));
}
============================================================
--- libpurple/protocols/toc/toc.c fbf653bfde663795d6c9a722eb33e0cb1f2a2705
+++ libpurple/protocols/toc/toc.c 16c66b2cfc906b5f4095f373a8a77b52d98712ae
@@ -2217,7 +2217,7 @@ static void accept_file_dialog(struct ft
}
purple_request_accept_cancel_with_hint(ft->gc, NULL, buf, NULL,
- PURPLE_DEFAULT_ACTION_NONE, PURPLE_REQUEST_HINT_XFER, ft,
+ PURPLE_DEFAULT_ACTION_NONE, PURPLE_REQUEST_UI_HINT_XFER, ft,
G_CALLBACK(toc_accept_ft),
G_CALLBACK(toc_reject_ft));
}
============================================================
--- libpurple/protocols/yahoo/yahoo.c 0f53467d2c795d65a8d47098e58a26fbc837bdf2
+++ libpurple/protocols/yahoo/yahoo.c 1ac673036f221169117b4c7fe17cd6899525581b
@@ -1033,7 +1033,7 @@ yahoo_buddy_add_deny_reason_cb(gpointer
_("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_HINT_BLIST, add_req);
+ PURPLE_REQUEST_UI_HINT_BLIST, add_req);
}
static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason)
@@ -2067,7 +2067,7 @@ static void yahoo_process_ignore(PurpleC
"will remove and ignore the buddy."), who);
purple_request_yes_no_with_hint(gc, NULL, _("Ignore buddy?"), buf, 0,
gc->account, who, NULL,
- PURPLE_REQUEST_HINT_BLIST, b,
+ PURPLE_REQUEST_UI_HINT_BLIST, b,
G_CALLBACK(ignore_buddy),
G_CALLBACK(keep_buddy));
break;
@@ -3499,7 +3499,7 @@ static void yahoo_show_act_id(PurplePlug
_("OK"), G_CALLBACK(yahoo_act_id),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, gc);
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
}
static void yahoo_show_chat_goto(PurplePluginAction *action)
@@ -3510,7 +3510,7 @@ static void yahoo_show_chat_goto(PurpleP
_("OK"), G_CALLBACK(yahoo_chat_goto),
_("Cancel"), NULL,
purple_connection_get_account(gc), NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, gc);
+ PURPLE_REQUEST_UI_HINT_CONV, gc);
}
static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
============================================================
--- libpurple/request.c 42492bc57ce09789c9d62f3cf3277b7bec2253ff
+++ libpurple/request.c 38fcb892f1720dd7a84f1b916297a61738f3f0c6
@@ -1230,7 +1230,7 @@ purple_request_input(void *handle, const
{
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_HINT_BLIST, user_data);
+ cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}
void *
@@ -1289,7 +1289,7 @@ purple_request_choice(void *handle, cons
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, PURPLE_REQUEST_HINT_BLIST, user_data, args);
+ account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, args);
va_end(args);
return ui_handle;
@@ -1330,7 +1330,7 @@ purple_request_choice_varg(void *handle,
{
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_HINT_BLIST, user_data, choices);
+ cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, choices);
}
void *
@@ -1384,7 +1384,7 @@ purple_request_action(void *handle, cons
va_start(args, action_count);
ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary,
default_action, account, who, conv,
- PURPLE_REQUEST_HINT_BLIST, user_data, action_count, args);
+ PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, args);
va_end(args);
return ui_handle;
@@ -1419,7 +1419,7 @@ purple_request_action_varg(void *handle,
{
return purple_request_action_varg_with_hint(
handle, title, primary, secondary, default_action, account, who, conv,
- PURPLE_REQUEST_HINT_BLIST, user_data, action_count, actions);
+ PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, actions);
}
void *
@@ -1463,7 +1463,7 @@ purple_request_fields(void *handle, cons
{
return purple_request_fields_with_hint(
handle, title, primary, secondary, fields, ok_text, ok_cb,
- cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
+ cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}
void *
@@ -1510,7 +1510,7 @@ purple_request_file(void *handle, const
void *user_data)
{
return purple_request_file_with_hint(
- handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
+ handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}
void *
@@ -1547,7 +1547,7 @@ purple_request_folder(void *handle, cons
void *user_data)
{
return purple_request_folder_with_hint(
- handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
+ handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}
void *
============================================================
--- libpurple/request.h c532cb5b3c1af07dabce1568e8c7025d29097501
+++ libpurple/request.h c8ca9ccc6c3eb768f7baa11778b6b15f4448cf24
@@ -205,32 +205,32 @@ typedef struct
/**
* @since 2.3.0
*/
-#define PURPLE_REQUEST_HINT_ACCOUNT "account"
+#define PURPLE_REQUEST_UI_HINT_ACCOUNT "account"
/**
* @since 2.3.0
*/
-#define PURPLE_REQUEST_HINT_BLIST "blist"
+#define PURPLE_REQUEST_UI_HINT_BLIST "blist"
/**
* @since 2.3.0
*/
-#define PURPLE_REQUEST_HINT_BUDDY "buddy"
+#define PURPLE_REQUEST_UI_HINT_BUDDY "buddy"
/**
* @since 2.3.0
*/
-#define PURPLE_REQUEST_HINT_CONV "conversation"
+#define PURPLE_REQUEST_UI_HINT_CONV "conversation"
/**
* @since 2.3.0
*/
-#define PURPLE_REQUEST_HINT_REGISTER "register-account"
+#define PURPLE_REQUEST_UI_HINT_REGISTER "register-account"
/**
* @since 2.3.0
*/
-#define PURPLE_REQUEST_HINT_XFER "xfer"
+#define PURPLE_REQUEST_UI_HINT_XFER "xfer"
/*
@@ -241,32 +241,32 @@ typedef struct
/**
* @since 2.3.0
*/
-#define PURPLE_UI_REQUEST_HINT_ACCOUNTMGR "accountmgr"
+#define PURPLE_REQUEST_UI_HINT_ACCOUNTMGR "accountmgr"
/**
* @since 2.3.0
*/
-#define PURPLE_UI_REQUEST_HINT_CERTMGR "certmgr"
+#define PURPLE_REQUEST_UI_HINT_CERTMGR "certmgr"
/**
* @since 2.3.0
*/
-#define PURPLE_UI_REQUEST_HINT_PLUGINMGR "pluginmgr"
+#define PURPLE_REQUEST_UI_HINT_PLUGINMGR "pluginmgr"
/**
* @since 2.3.0
*/
-#define PURPLE_UI_REQUEST_HINT_POUNCEMGR "pouncemgr"
+#define PURPLE_REQUEST_UI_HINT_POUNCEMGR "pouncemgr"
/**
* @since 2.3.0
*/
-#define PURPLE_UI_REQUEST_HINT_PREFSMGR "preferences"
+#define PURPLE_REQUEST_UI_HINT_PREFSMGR "preferences"
/**
* @since 2.3.0
*/
-#define PURPLE_UI_REQUEST_HINT_STATUSMGR "statusmgr"
+#define PURPLE_REQUEST_UI_HINT_STATUSMGR "statusmgr"
/**
============================================================
--- pidgin/gtkaccount.c 8b6d90b7acd8e94e4323fad2026aea77101b464e
+++ pidgin/gtkaccount.c 7d1505720e17413b0eaa8e327ba16d3cc424bf1d
@@ -1904,7 +1904,7 @@ ask_delete_account_sel(GtkTreeModel *mod
purple_request_close_with_handle(account);
purple_request_action_with_hint(account, NULL, buf, NULL, 0,
account, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_ACCOUNTMGR, account, 2,
+ PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, account, 2,
_("Delete"), delete_account_cb,
_("Cancel"), NULL);
g_free(buf);
============================================================
--- pidgin/gtkblist.c 7f348dd509f3dc128df01d64fa33341d406e6113
+++ pidgin/gtkblist.c a8a79e455717852b417573b8d6f80f8783a076fe
@@ -524,7 +524,7 @@ gtk_blist_auto_personize(PurpleBlistNode
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. "
"You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
+ PURPLE_REQUEST_UI_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
g_free(msg);
} else
g_list_free(merges);
@@ -4325,7 +4325,7 @@ connection_error_button_clicked_cb(GtkBu
enabled = purple_account_get_enabled(account, purple_core_get_ui());
purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2,
account, NULL, NULL,
- PURPLE_REQUEST_HINT_ACCOUNT, account, 3,
+ PURPLE_REQUEST_UI_HINT_ACCOUNT, account, 3,
_("OK"), NULL,
_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
enabled ? _("Connect") : _("Re-enable Account"),
@@ -6287,7 +6287,7 @@ pidgin_blist_request_add_group(void)
_("Add"), G_CALLBACK(add_group_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
void
============================================================
--- pidgin/gtkcertmgr.c c9bbd068278f6ea88d3569af9f34f303c4584a2c
+++ pidgin/gtkcertmgr.c 818babed6e3902beb75d5d0a8872e3625811be78
@@ -197,7 +197,7 @@ tls_peers_mgmt_import_ok_cb(gpointer dat
_("Cancel"),
G_CALLBACK(tls_peers_mgmt_import_cancel2_cb),
NULL, NULL, NULL, /* No account/who/conv*/
- PURPLE_UI_REQUEST_HINT_CERTMGR, crt /* Pass cert instance to callback*/
+ PURPLE_REQUEST_UI_HINT_CERTMGR, crt /* Pass cert instance to callback*/
);
g_free(default_hostname);
@@ -226,7 +226,7 @@ tls_peers_mgmt_import_cb(GtkWidget *butt
FALSE, /* Not a save dialog */
G_CALLBACK(tls_peers_mgmt_import_ok_cb),
NULL, /* Do nothing if cancelled */
- NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_CERTMGR, NULL );/* No account,conv,etc. */
+ NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, NULL );/* No account,conv,etc. */
}
static void
@@ -302,7 +302,7 @@ tls_peers_mgmt_export_cb(GtkWidget *butt
G_CALLBACK(tls_peers_mgmt_export_ok_cb),
G_CALLBACK(tls_peers_mgmt_export_cancel_cb),
NULL, NULL, NULL, /* No account,conv,etc. */
- PURPLE_UI_REQUEST_HINT_CERTMGR, crt); /* Pass the certificate on to the callback */
+ PURPLE_REQUEST_UI_HINT_CERTMGR, crt); /* Pass the certificate on to the callback */
}
static void
@@ -375,7 +375,7 @@ tls_peers_mgmt_delete_cb(GtkWidget *butt
primary, NULL, /* Can this be NULL? */
2, /* NO is default action */
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_CERTMGR,
+ PURPLE_REQUEST_UI_HINT_CERTMGR,
id, /* id ownership passed to callback */
tls_peers_mgmt_delete_confirm_cb,
tls_peers_mgmt_delete_confirm_cb );
============================================================
--- pidgin/gtkconv.c 4937dd6322df21043042b1471983a6e187290252
+++ pidgin/gtkconv.c 25d3a991f261f70b56e427117a68c37d2cd508b8
@@ -1033,7 +1033,7 @@ menu_save_as_cb(gpointer data, guint act
buf,
TRUE, G_CALLBACK(savelog_writefile_cb), NULL,
NULL, NULL, conv,
- PURPLE_REQUEST_HINT_BLIST, conv);
+ PURPLE_REQUEST_UI_HINT_BLIST, conv);
g_free(buf);
}
@@ -2721,7 +2721,7 @@ icon_menu_save_cb(GtkWidget *widget, Pid
purple_request_file_with_hint(gtkconv, _("Save Icon"), buf, TRUE,
G_CALLBACK(saveicon_writefile_cb), NULL,
conv->account, NULL, conv,
- PURPLE_REQUEST_HINT_BLIST, gtkconv);
+ PURPLE_REQUEST_UI_HINT_BLIST, gtkconv);
g_free(buf);
}
============================================================
--- pidgin/gtkdebug.c c95b2c74a2103bcaca09bd6533aff25d13572b79
+++ pidgin/gtkdebug.c 7047349e838b62e57ed6b6a4bf89b6453b057396
@@ -235,7 +235,7 @@ save_cb(GtkWidget *w, DebugWindow *win)
purple_request_file_with_hint(win, _("Save Debug Log"), "purple-debug.log", TRUE,
G_CALLBACK(save_writefile_cb), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, win);
+ PURPLE_REQUEST_UI_HINT_BLIST, win);
}
static void
============================================================
--- pidgin/gtkdialogs.c 0a84d33a97094b50271ee370dcb13691ead317b5
+++ pidgin/gtkdialogs.c ee2066fb65e84d26faa66353f1acd02a3bd7b59c
@@ -787,7 +787,7 @@ pidgin_dialogs_im(void)
_("OK"), G_CALLBACK(pidgin_dialogs_im_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
void
@@ -926,7 +926,7 @@ pidgin_dialogs_info(void)
_("OK"), G_CALLBACK(pidgin_dialogs_info_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static void
@@ -1018,7 +1018,7 @@ pidgin_dialogs_log(void)
_("OK"), G_CALLBACK(pidgin_dialogs_log_cb),
_("Cancel"), NULL,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, NULL);
+ PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}
static void
@@ -1038,7 +1038,7 @@ pidgin_dialogs_alias_contact(PurpleConta
_("Alias"), G_CALLBACK(pidgin_dialogs_alias_contact_cb),
_("Cancel"), NULL,
NULL, purple_contact_get_alias(contact), NULL,
- PURPLE_REQUEST_HINT_BLIST, contact);
+ PURPLE_REQUEST_UI_HINT_BLIST, contact);
}
static void
@@ -1062,7 +1062,7 @@ pidgin_dialogs_alias_buddy(PurpleBuddy *
_("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb),
_("Cancel"), NULL,
purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,
- PURPLE_REQUEST_HINT_BLIST, buddy);
+ PURPLE_REQUEST_UI_HINT_BLIST, buddy);
g_free(secondary);
}
@@ -1084,7 +1084,7 @@ pidgin_dialogs_alias_chat(PurpleChat *ch
_("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb),
_("Cancel"), NULL,
chat->account, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, chat);
+ PURPLE_REQUEST_UI_HINT_BLIST, chat);
}
static void
@@ -1128,7 +1128,7 @@ pidgin_dialogs_remove_contact(PurpleCont
purple_request_action_with_hint(contact, NULL, _("Remove Contact"), text, 0,
NULL, purple_contact_get_alias(contact), NULL,
- PURPLE_REQUEST_HINT_BLIST, contact, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, contact, 2,
_("_Remove Contact"), G_CALLBACK(pidgin_dialogs_remove_contact_cb),
_("Cancel"),
NULL);
@@ -1169,7 +1169,7 @@ pidgin_dialogs_merge_groups(PurpleGroup
purple_request_action_with_hint(source, NULL, _("Merge Groups"), text, 0,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, ggp, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, ggp, 2,
_("_Merge Groups"), G_CALLBACK(pidgin_dialogs_merge_groups_cb),
_("Cancel"), G_CALLBACK(free_ggmo));
@@ -1225,7 +1225,7 @@ pidgin_dialogs_remove_group(PurpleGroup
purple_request_action_with_hint(group, NULL, _("Remove Group"), text, 0,
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, group, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, group, 2,
_("_Remove Group"), G_CALLBACK(pidgin_dialogs_remove_group_cb),
_("Cancel"), NULL);
@@ -1264,7 +1264,7 @@ pidgin_dialogs_remove_buddy(PurpleBuddy
purple_request_action_with_hint(buddy, NULL, _("Remove Buddy"), text, 0,
purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,
- PURPLE_REQUEST_HINT_BLIST, buddy, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, buddy, 2,
_("_Remove Buddy"), G_CALLBACK(pidgin_dialogs_remove_buddy_cb),
_("Cancel"), NULL);
@@ -1291,7 +1291,7 @@ pidgin_dialogs_remove_chat(PurpleChat *c
purple_request_action_with_hint(chat, NULL, _("Remove Chat"), text, 0,
chat->account, NULL, NULL,
- PURPLE_REQUEST_HINT_BLIST, chat, 2,
+ PURPLE_REQUEST_UI_HINT_BLIST, chat, 2,
_("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb),
_("Cancel"), NULL);
============================================================
--- pidgin/gtkimhtmltoolbar.c 31e46b004cfc7e772950b2551ab8e520fbd23b08
+++ pidgin/gtkimhtmltoolbar.c 6a6857fb78c72a036a492ff5af0bde34c3f5a67b
@@ -436,7 +436,7 @@ insert_link_cb(GtkWidget *w, GtkIMHtmlTo
_("_Insert"), G_CALLBACK(do_insert_link_cb),
_("Cancel"), G_CALLBACK(cancel_link_cb),
NULL, NULL, NULL,
- PURPLE_REQUEST_HINT_CONV, toolbar);
+ PURPLE_REQUEST_UI_HINT_CONV, toolbar);
g_free(msg);
g_free(desc);
} else {
============================================================
--- pidgin/gtkplugin.c 70e8a711c8916dd5c1be9045302c6a0c90174560
+++ pidgin/gtkplugin.c 8beaf85b5a9bc8ad9187d240c6db5ef35965936b
@@ -284,7 +284,7 @@ static void plugin_toggled(GtkCellRender
_("Multiple plugins will be unloaded."),
tmp->str, 0,
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_PLUGINMGR, cb_data, 2,
+ PURPLE_REQUEST_UI_HINT_PLUGINMGR, cb_data, 2,
_("Unload Plugins"), G_CALLBACK(plugin_unload_confirm_cb),
_("Cancel"), g_free);
g_string_free(tmp, TRUE);
============================================================
--- pidgin/gtkpounce.c 549f1f62200a01112d481034a21dfe5e3dca96ce
+++ pidgin/gtkpounce.c c68ab5ccdbf4004e792b4f5a8a16049ad7e677c3
@@ -1110,7 +1110,7 @@ pounces_manager_delete_foreach(GtkTreeMo
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,
account, pouncee, NULL,
- PURPLE_UI_REQUEST_HINT_POUNCEMGR, pounce, 2,
+ PURPLE_REQUEST_UI_HINT_POUNCEMGR, pounce, 2,
_("Delete"), pounces_manager_delete_confirm_cb,
_("Cancel"), NULL);
g_free(buf);
============================================================
--- pidgin/gtkprefs.c e81f711f166e1b389809f7446a1f67ff0bbf4efa
+++ pidgin/gtkprefs.c 980d614a1dfe8fe151f7f13e384dec7f0f31fdd7
@@ -642,7 +642,7 @@ add_theme_button_clicked_cb(GtkWidget *w
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_UI_REQUEST_HINT_PREFSMGR, NULL) ;
+ (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL) ;
}
static void
@@ -1627,7 +1627,7 @@ static void select_sound(GtkWidget *butt
purple_request_file_with_hint(prefs, _("Sound Selection"), filename, FALSE,
G_CALLBACK(sound_chosen_cb), NULL,
- NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_PREFSMGR,
+ NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR,
GINT_TO_POINTER(sound_row_sel));
}
============================================================
--- pidgin/gtkrequest.c 92c4f855594d211c24baff8e825dfa34ff6e34ae
+++ pidgin/gtkrequest.c 433ff00d13ccdd14f3ef8a03ef877bc541374a15
@@ -106,16 +106,16 @@ get_request_parent(const char *ui_hint,
if (convo)
return GTK_WINDOW(convo->win->window);
- if (strcmp(ui_hint, PURPLE_REQUEST_HINT_BLIST)) {
+ 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_HINT_REGISTER))
+ if (!strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_REGISTER))
toplevel = find_toplevel(ll_toplevels, "account");
else
- if (!strcmp(ui_hint, PURPLE_REQUEST_HINT_XFER))
+ if (!strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_XFER))
toplevel = find_toplevel(ll_toplevels, "file transfer");
}
============================================================
--- pidgin/gtksavedstatuses.c 6535d71342b8f5186729f3dd98185b4ae1625bc1
+++ pidgin/gtksavedstatuses.c 7874b9481c1e8bb37a5ee4ab09c7ddec36d731fc
@@ -340,7 +340,7 @@ status_window_delete_cb(GtkButton *butto
purple_request_action_with_hint(handle, NULL, title, NULL, 0,
NULL, NULL, NULL,
- PURPLE_UI_REQUEST_HINT_STATUSMGR, sel_titles, 2,
+ PURPLE_REQUEST_UI_HINT_STATUSMGR, sel_titles, 2,
_("Delete"), status_window_delete_confirm_cb,
_("Cancel"), status_window_delete_cancel_cb);
============================================================
--- pidgin/gtkutils.c fb0f24b34b2d2656aa7417148d649c642965a7d2
+++ pidgin/gtkutils.c f25493f512c5a1c71fec0042990020ff45a816b5
@@ -1537,7 +1537,7 @@ pidgin_dnd_file_manage(GtkSelectionData
DND_FILE_TRANSFER, "OK", (GCallback)dnd_image_ok_callback,
"Cancel", (GCallback)dnd_image_cancel_callback,
account, who, NULL,
- PURPLE_REQUEST_HINT_CONV, data,
+ PURPLE_REQUEST_UI_HINT_CONV, data,
_("Set as buddy icon"), DND_BUDDY_ICON,
_("Send image file"), DND_FILE_TRANSFER,
_("Insert in message"), DND_IM_IMAGE,
@@ -1547,7 +1547,7 @@ pidgin_dnd_file_manage(GtkSelectionData
_("Would you like to set it as the buddy icon for this user?"),
0,
account, who, NULL,
- PURPLE_REQUEST_HINT_CONV, data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb);
+ PURPLE_REQUEST_UI_HINT_CONV, data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb);
else
purple_request_choice_with_hint(NULL, NULL,
_("You have dragged an image"),
@@ -1557,7 +1557,7 @@ pidgin_dnd_file_manage(GtkSelectionData
"OK", (GCallback)dnd_image_ok_callback,
"Cancel", (GCallback)dnd_image_cancel_callback,
account, who, NULL,
- PURPLE_REQUEST_HINT_CONV, data,
+ PURPLE_REQUEST_UI_HINT_CONV, data,
_("Set as buddy icon"), DND_BUDDY_ICON,
(ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE),
NULL);
More information about the Commits
mailing list