changeset 21236:73c5f5bfeb39

disapproval of revision '4b2b98ecc70947f687d13c902b1b031247b49392'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:27:01 +0000
parents fba1f6c3df0b
children 8ae227dca885
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/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/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/gtksavedstatuses.c pidgin/gtkutils.c
diffstat 69 files changed, 179 insertions(+), 201 deletions(-) [+]
line wrap: on
line diff
--- a/finch/gntaccount.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntaccount.c	Fri Nov 16 23:27:01 2007 +0000
@@ -633,7 +633,7 @@
 			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, "accounts", account, 2,
 						  _("Delete"), really_delete_account,
 						  _("Cancel"), NULL);
 	g_free(prompt);
@@ -884,7 +884,7 @@
 	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,
+						"blist", data, 2,
 	                    _("Add"),    G_CALLBACK(add_user_cb),
 	                    _("Cancel"), G_CALLBACK(free_add_user_data));
 	g_free(buffer);
@@ -972,7 +972,7 @@
 		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,
+			"blist", aa, 2,
 			_("Authorize"), authorize_and_add_cb,
 			_("Deny"), deny_no_add_cb);
 		gnt_screen_release(widget);
@@ -999,7 +999,7 @@
 		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,
+			"blist", user_data, 2,
 			_("Authorize"), auth_cb,
 			_("Deny"), deny_cb);
 	}
--- a/finch/gntblist.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntblist.c	Fri Nov 16 23:27:01 2007 +0000
@@ -343,7 +343,7 @@
 			_("Add"), G_CALLBACK(add_buddy_cb),
 			_("Cancel"), NULL,
 			account, NULL, NULL,
-			PURPLE_REQUEST_HINT_BLIST, NULL);
+			"blist", NULL);
 }
 
 static void
@@ -420,7 +420,7 @@
 			_("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);
+			"blist", NULL);
 }
 
 static void
@@ -455,7 +455,7 @@
 			NULL, FALSE, FALSE, NULL,
 			_("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_BLIST, NULL);
+			"blist", NULL);
 }
 
 static PurpleBlistUiOps blist_ui_ops =
@@ -802,7 +802,7 @@
 	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);
+			"blist", chat);
 }
 
 static void
@@ -1004,7 +1004,7 @@
 			name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node),
 			_("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_BLIST, node);
+			"blist", node);
 
 	g_free(prompt);
 }
@@ -1096,7 +1096,7 @@
 			primary, sec,
 			1,
 			account, name, NULL,
-			PURPLE_REQUEST_HINT_BLIST, node, 2,
+			"blist", node, 2,
 			_("Remove"), finch_blist_remove_node,
 			_("Cancel"), NULL);
 	g_free(primary);
@@ -2223,7 +2223,7 @@
 						_("OK"), G_CALLBACK(send_im_select_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, NULL);
+						"blist", NULL);
 }
 
 static void
@@ -2286,7 +2286,7 @@
 						_("Join"), G_CALLBACK(join_chat_select_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, NULL);
+						"blist", NULL);
 }
 
 static void
--- a/finch/gntcertmgr.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntcertmgr.c	Fri Nov 16 23:27:01 2007 +0000
@@ -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_UI_REQUEST_HINT_CERTMGR, crt);
+				"certmgr", crt);
 		g_free(default_hostname);
 	} else {
 		gchar * secondary;
@@ -112,7 +112,7 @@
 			FALSE,
 			G_CALLBACK(tls_peers_mgmt_import_ok_cb),
 			NULL,
-			NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_CERTMGR, NULL );
+			NULL, NULL, NULL, "certmgr", NULL );
 }
 
 /* Save certs in some file */
@@ -161,7 +161,7 @@
 			G_CALLBACK(tls_peers_mgmt_export_ok_cb),
 			G_CALLBACK(purple_certificate_destroy),
 			NULL, NULL, NULL,
-			PURPLE_UI_REQUEST_HINT_CERTMGR, crt);
+			"certmgr", crt);
 }
 
 /* Show information about a cert */
@@ -236,7 +236,7 @@
 	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, "certmgr",
 			g_strdup(key),
 			tls_peers_mgmt_delete_confirm_cb,
 			g_free);
--- a/finch/gntconn.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntconn.c	Fri Nov 16 23:27:01 2007 +0000
@@ -132,7 +132,7 @@
 
 		purple_request_action_with_hint(account, NULL, primary, secondary, 2,
 							account, NULL, NULL,
-							PURPLE_REQUEST_HINT_BLIST, account, 3,
+							"blist", 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	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntplugin.c	Fri Nov 16 23:27:01 2007 +0000
@@ -472,6 +472,6 @@
 	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);
+			"plugins", NULL);
 }
 
--- a/finch/gntpounce.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntpounce.c	Fri Nov 16 23:27:01 2007 +0000
@@ -662,7 +662,7 @@
 	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,
+						"pounces", pounce, 2,
 						_("Delete"), pounces_manager_delete_confirm_cb,
 						_("Cancel"), NULL);
 	g_free(buf);
--- a/finch/gntprefs.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntprefs.c	Fri Nov 16 23:27:01 2007 +0000
@@ -264,6 +264,6 @@
 	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);
+			"preferences", NULL);
 }
 
--- a/finch/gntstatus.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/finch/gntstatus.c	Fri Nov 16 23:27:01 2007 +0000
@@ -140,7 +140,7 @@
 
 	purple_request_action_with_hint(saved, _("Delete Status"), ask, NULL, 0,
 			NULL, NULL, NULL,
-			PURPLE_UI_REQUEST_HINT_STATUSMGR, saved, 2,
+			"statuses", saved, 2,
 			_("Delete"), really_delete_status,
 			_("Cancel"), NULL);
 	g_free(ask);
--- a/libpurple/account.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/account.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1015,7 +1015,7 @@
                         _("OK"), ok_cb,
                         _("Cancel"), cancel_cb,
 						account, NULL, NULL,
-                        PURPLE_REQUEST_HINT_ACCOUNT, user_data);
+                        "account", user_data);
 	g_free(primary);
 }
 
@@ -1304,7 +1304,7 @@
 						_("OK"), G_CALLBACK(change_password_cb),
 						_("Cancel"), NULL,
 						account, NULL, NULL,
-						PURPLE_REQUEST_HINT_ACCOUNT, account);
+						"account", account);
 }
 
 static void
@@ -1339,7 +1339,7 @@
 					   _("Save"), G_CALLBACK(set_user_info_cb),
 					   _("Cancel"), NULL,
 					   account, NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, account);
+					   "account", account);
 }
 
 void
--- a/libpurple/certificate.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/certificate.c	Fri Nov 16 23:27:01 2007 +0000
@@ -572,7 +572,7 @@
 		NULL,         /* No account */
 		NULL,         /* No other user */
 		NULL,         /* No associated conversation */
-		PURPLE_REQUEST_HINT_BLIST,
+		"blist",
 		vrq,
 		x509_singleuse_verify_cb,
 		x509_singleuse_verify_cb );
@@ -1195,7 +1195,7 @@
 		NULL,         /* No account */
 		NULL,         /* No other user */
 		NULL,         /* No associated conversation */
-		PURPLE_REQUEST_HINT_BLIST,
+		"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	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/conversation.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1211,7 +1211,7 @@
 
 	purple_request_action_with_hint(conv, NULL, _("Send Message"), text, 0,
 						  purple_conversation_get_account(conv), NULL, conv,
-						  PURPLE_REQUEST_HINT_CONV, data, 2,
+						  "conversation", data, 2,
 						  _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb),
 						  _("Cancel"), NULL);
 }
--- a/libpurple/ft.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/ft.c	Fri Nov 16 23:27:01 2007 +0000
@@ -314,7 +314,7 @@
 					  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);
+					  "xfer", xfer);
 
 	return 0;
 }
@@ -362,7 +362,7 @@
 		purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL,
 								  PURPLE_DEFAULT_ACTION_NONE,
 								  xfer->account, xfer->who, NULL,
-								  PURPLE_REQUEST_HINT_XFER, xfer,
+								  "xfer", xfer,
 								  G_CALLBACK(purple_xfer_choose_file),
 								  G_CALLBACK(cancel_recv_cb));
 
@@ -405,7 +405,7 @@
 	purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2,
 							   PURPLE_DEFAULT_ACTION_NONE,
 							   xfer->account, xfer->who, NULL,
-							   PURPLE_REQUEST_HINT_XFER, xfer,
+							   "xfer", xfer,
 							   G_CALLBACK(ask_accept_ok),
 							   G_CALLBACK(ask_accept_cancel));
 	g_free(buf);
--- a/libpurple/plugins/autoaccept.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/plugins/autoaccept.c	Fri Nov 16 23:27:01 2007 +0000
@@ -164,7 +164,7 @@
 						_("_Save"), G_CALLBACK(save_cb),
 						_("_Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_XFER, node,
+						"xfer", node,
 						_("Ask"), FT_ASK,
 						_("Auto Accept"), FT_ACCEPT,
 						_("Auto Reject"), FT_REJECT,
--- a/libpurple/plugins/buddynote.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Fri Nov 16 23:27:01 2007 +0000
@@ -50,7 +50,7 @@
 					   _("Save"), G_CALLBACK(do_it_cb),
 					   _("Cancel"), G_CALLBACK(dont_do_it_cb),
 					   NULL, NULL, NULL,
-					   PURPLE_REQUEST_HINT_BUDDY, node);
+					   "buddy", node);
 }
 
 static void
--- a/libpurple/plugins/idle.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/plugins/idle.c	Fri Nov 16 23:27:01 2007 +0000
@@ -169,7 +169,7 @@
 			_("_Set"), G_CALLBACK(idle_action_ok),
 			_("_Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_ACCOUNT, NULL);
+			"account", NULL);
 }
 
 static void
@@ -203,7 +203,7 @@
 			_("_Unset"), G_CALLBACK(unidle_action_ok),
 			_("_Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_ACCOUNT, NULL);
+			"account", NULL);
 }
 
 static void
@@ -229,7 +229,7 @@
 			_("_Set"), G_CALLBACK(idle_all_action_ok),
 			_("_Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_ACCOUNT, NULL);
+			"account", NULL);
 }
 
 static void
--- a/libpurple/plugins/offlinemsg.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/plugins/offlinemsg.c	Fri Nov 16 23:27:01 2007 +0000
@@ -161,7 +161,7 @@
 					_("You can edit/delete the pounce from the `Buddy Pounces' dialog"),
 					1,
 					offline->account, offline->who, offline->conv,
-					PURPLE_REQUEST_HINT_BUDDY, offline, 2,
+					"buddy", offline, 2,
 					_("Yes"), record_pounce,
 					_("No"), cancel_poune);
 		g_free(ask);
--- a/libpurple/plugins/perl/common/Request.xs	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/plugins/perl/common/Request.xs	Fri Nov 16 23:27:01 2007 +0000
@@ -141,7 +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_HINT_BLIST, gpr);
+	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, "blist", gpr);
 OUTPUT:
 	RETVAL
 
@@ -196,7 +196,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_HINT_BLIST, gpr);
+	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, "blist", gpr);
 OUTPUT:
 	RETVAL
 
@@ -248,7 +248,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_HINT_BLIST, gpr);
+	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, "blist", gpr);
 OUTPUT:
 	RETVAL
 
--- a/libpurple/protocols/gg/gg.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/gg/gg.c	Fri Nov 16 23:27:01 2007 +0000
@@ -336,7 +336,7 @@
 	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);
+			"blist", gc);
 }
 /* }}} */
 
@@ -350,7 +350,7 @@
 	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);
+			"blist", gc);
 }
 /* }}} */
 
@@ -506,7 +506,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_HINT_REGISTER, gc);
+		"register-account", gc);
 }
 /* }}} */
 
@@ -665,7 +665,7 @@
 		_("OK"), G_CALLBACK(ggp_callback_find_buddies),
 		_("Cancel"), NULL,
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_HINT_BLIST, gc);
+		"blist", gc);
 }
 /* }}} */
 
@@ -802,7 +802,7 @@
 		fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok),
 		_("Cancel"), NULL,
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_HINT_ACCOUNT, gc);
+		"account", gc);
 
 	g_free(msg);
 }
@@ -883,7 +883,7 @@
 			_("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,			  
-			PURPLE_REQUEST_HINT_BUDDY, gc);
+			"buddy", gc);
 	g_free(msg);
 }
 /* }}} */
--- a/libpurple/protocols/jabber/auth.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Fri Nov 16 23:27:01 2007 +0000
@@ -321,7 +321,7 @@
 					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, "account", js->gc->account,
 							allow_cyrus_plaintext_auth,
 							disallow_plaintext_auth);
 					g_free(msg);
@@ -512,7 +512,7 @@
 					msg,
 					2,
 					purple_connection_get_account(js->gc), NULL, NULL,
-					PURPLE_REQUEST_HINT_ACCOUNT, purple_connection_get_account(js->gc),
+					"account", purple_connection_get_account(js->gc),
 					allow_plaintext_auth, disallow_plaintext_auth);
 			g_free(msg);
 			return;
@@ -600,7 +600,7 @@
 						_("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),
+						"account", purple_connection_get_account(js->gc),
 						allow_plaintext_auth, disallow_plaintext_auth);
 				return;
 			}
--- a/libpurple/protocols/jabber/buddy.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Fri Nov 16 23:27:01 2007 +0000
@@ -727,7 +727,7 @@
 						_("Save"), G_CALLBACK(jabber_format_info),
 						_("Cancel"), NULL,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_HINT_ACCOUNT, gc);
+						"account", gc);
 }
 
 /*---------------------------------------*/
@@ -2415,7 +2415,7 @@
 				_("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);
+				"account", usi);
 
 		g_free(instructions);
 	}
@@ -2451,7 +2451,7 @@
 			_("Search Directory"), PURPLE_CALLBACK(jabber_user_search),
 			_("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_ACCOUNT, js);
+			"account", js);
 }
 
 
--- a/libpurple/protocols/jabber/chat.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/chat.c	Fri Nov 16 23:27:01 2007 +0000
@@ -785,7 +785,7 @@
 			_("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);
+			"chat", js);
 
 	return js->roomlist;
 }
--- a/libpurple/protocols/jabber/jabber.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1007,7 +1007,7 @@
 				_("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);
+				"register-account", 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 @@
 			  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);
+			  "register-account", cbdata);
 		g_free(title);
 	}
 
@@ -1712,7 +1712,7 @@
 			fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_HINT_ACCOUNT, js);
+			"account", js);
 }
 
 GList *jabber_actions(PurplePlugin *plugin, gpointer context)
--- a/libpurple/protocols/jabber/presence.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Fri Nov 16 23:27:01 2007 +0000
@@ -520,7 +520,7 @@
 											" accept the default settings?"),
 										/* Default Action */ 1,
 										purple_connection_get_account(js->gc), NULL, chat->conv,
-										PURPLE_REQUEST_HINT_CONV, chat, 2,
+										"chat", 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	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/si.c	Fri Nov 16 23:27:01 2007 +0000
@@ -872,7 +872,7 @@
 
 			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, "xfer", xfer);
 
 			g_free(msg);
 		}
--- a/libpurple/protocols/jabber/usermood.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Fri Nov 16 23:27:01 2007 +0000
@@ -201,7 +201,7 @@
 						  _("Set"), G_CALLBACK(do_mood_set_from_fields),
 						  _("Cancel"), NULL,
 						  purple_connection_get_account(gc), NULL, NULL,
-						  PURPLE_REQUEST_HINT_BLIST, gc);
+						  "blist", gc);
 	
 }
 
--- a/libpurple/protocols/jabber/usernick.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/usernick.c	Fri Nov 16 23:27:01 2007 +0000
@@ -76,7 +76,7 @@
 	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, "blist", js);
 	g_free(oldnickname);
 }
 
--- a/libpurple/protocols/jabber/xdata.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Fri Nov 16 23:27:01 2007 +0000
@@ -399,7 +399,7 @@
 			_("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);
+			"account", data);
 
 	g_free(title);
 	g_free(instructions);
--- a/libpurple/protocols/msn/dialog.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/msn/dialog.c	Fri Nov 16 23:27:01 2007 +0000
@@ -137,7 +137,7 @@
 
 	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,
+						"blist", data, 2,
 						_("Yes"), G_CALLBACK(msn_add_cb),
 						_("No"), G_CALLBACK(msn_rem_cb));
 
--- a/libpurple/protocols/msn/msn.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Fri Nov 16 23:27:01 2007 +0000
@@ -289,7 +289,7 @@
 					   _("OK"), G_CALLBACK(msn_act_id),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "account", gc);
 }
 
 static void
@@ -306,7 +306,7 @@
 					   _("OK"), G_CALLBACK(msn_set_home_phone_cb),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "account", gc);
 }
 
 static void
@@ -323,7 +323,7 @@
 					   _("OK"), G_CALLBACK(msn_set_work_phone_cb),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "account", gc);
 }
 
 static void
@@ -340,7 +340,7 @@
 					   _("OK"), G_CALLBACK(msn_set_mobile_phone_cb),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "account", gc);
 }
 
 static void
@@ -356,7 +356,7 @@
 						  "to your cell phone or other mobile device?"),
 						-1,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_HINT_ACCOUNT, gc, 3,
+						"account", gc, 3,
 						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
 						_("Disallow"), G_CALLBACK(disable_msn_pages_cb),
 						_("Cancel"), NULL);
@@ -405,7 +405,7 @@
 					   _("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);
+					   "account", data);
 }
 
 static gboolean
--- a/libpurple/protocols/novell/novell.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1915,7 +1915,7 @@
 	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,
+						"chat", parms, 2,
 						_("Yes"), G_CALLBACK(_join_conference_cb),
 						_("No"), G_CALLBACK(_reject_conference_cb));
 
--- a/libpurple/protocols/oscar/oscar.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1454,7 +1454,7 @@
 					   _("_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);
+					   "account", gc);
 	g_free(primary);
 
 	return 1;
@@ -2246,7 +2246,7 @@
 					   _("_OK"), G_CALLBACK(purple_auth_request),
 					   _("_Cancel"), G_CALLBACK(purple_auth_dontrequest),
 					   purple_connection_get_account(gc), name, NULL,
-					   PURPLE_REQUEST_HINT_BLIST, data);
+					   "blist", data);
 }
 
 
@@ -2295,7 +2295,7 @@
 					   _("_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);
+					   "blist", data);
 }
 
 /* When someone sends you buddies */
@@ -2481,7 +2481,7 @@
 										  "to your buddy list?"),
 										PURPLE_DEFAULT_ACTION_NONE,
 										purple_connection_get_account(gc), data->name, NULL,
-										PURPLE_REQUEST_HINT_BLIST, data, 2,
+										"blist", data, 2,
 										_("_Add"), G_CALLBACK(purple_icq_buddyadd),
 										_("_Decline"), G_CALLBACK(oscar_free_name_data));
 					g_free(message);
@@ -5236,7 +5236,7 @@
 	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,
+						"blist", data,
 						G_CALLBACK(purple_icq_buddyadd),
 						G_CALLBACK(oscar_free_name_data));
 	g_free(dialog_msg);
@@ -5937,7 +5937,7 @@
 					   _("_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);
+					   "buddy", data);
 	g_free(title);
 
 	g_free(comment);
@@ -5988,7 +5988,7 @@
 			  "wish to continue?"),
 			0,
 			purple_connection_get_account(gc), data->who, NULL,
-			PURPLE_REQUEST_HINT_BUDDY, data, 2,
+			"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 @@
 						_("OK"), G_CALLBACK(oscar_icq_privacy_opts),
 						_("Cancel"), NULL,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_HINT_ACCOUNT, gc);
+						"account", gc);
 }
 
 static void oscar_format_screenname(PurpleConnection *gc, const char *nick) {
@@ -6218,7 +6218,7 @@
 					   _("_OK"), G_CALLBACK(oscar_change_email),
 					   _("_Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "account", gc);
 }
 
 static void oscar_show_awaitingauth(PurplePluginAction *action)
@@ -6288,7 +6288,7 @@
 					   _("_Search"), G_CALLBACK(search_by_email_cb),
 					   _("_Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "buddy", gc);
 }
 
 static void oscar_show_set_info(PurplePluginAction *action)
--- a/libpurple/protocols/oscar/peer.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/oscar/peer.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1041,7 +1041,7 @@
 						  "risk."),
 						PURPLE_DEFAULT_ACTION_NONE,
 						account, sn, NULL,
-						PURPLE_REQUEST_HINT_BUDDY, conn, 2,
+						"buddy", 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_opt.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/qq/buddy_opt.c	Fri Nov 16 23:27:01 2007 +0000
@@ -213,7 +213,7 @@
 			   _("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);
+			   "buddy", g2);
 	g_free(nombre);
 }
 
@@ -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_HINT_BUDDY, g);
+					   "buddy", g);
 			g_free(msg);
 			g_free(nombre);
 		} else {	/* add OK */
--- a/libpurple/protocols/qq/group.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/qq/group.c	Fri Nov 16 23:27:01 2007 +0000
@@ -123,7 +123,7 @@
 			   _("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);
+			   "chat", gc);
 
 	return qd->roomlist;
 }
--- a/libpurple/protocols/qq/group_im.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/qq/group_im.c	Fri Nov 16 23:27:01 2007 +0000
@@ -137,7 +137,7 @@
 			    msg, reason,
 			    2,
 				purple_connection_get_account(gc), nombre, NULL,
-				PURPLE_REQUEST_HINT_CONV, g, 3,
+				"chat", g, 3,
 			    _("Approve"),
 			    G_CALLBACK
 			    (qq_group_approve_application_with_struct),
--- a/libpurple/protocols/qq/group_join.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/qq/group_join.c	Fri Nov 16 23:27:01 2007 +0000
@@ -139,7 +139,7 @@
 			   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);
+			   "chat", g);
 	g_free(msg);
 }
 
@@ -362,7 +362,7 @@
 			    ("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"),
+			    "chat", 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	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/qq/group_opt.c	Fri Nov 16 23:27:01 2007 +0000
@@ -123,7 +123,7 @@
 	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,
+					"chat", g, 2,
 					_("Reject"), G_CALLBACK(qq_group_reject_application_with_struct),
 					_("Approve"), G_CALLBACK(qq_group_approve_application_with_struct));
 }
@@ -143,7 +143,7 @@
 			   _("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);
+			   "chat", g);
 
 	g_free(msg1);
 	g_free(msg2);
@@ -394,7 +394,7 @@
 			    ("Would you like to set up the Qun details now?"),
 			    1,
 				purple_connection_get_account(gc), NULL, NULL,
-				PURPLE_REQUEST_HINT_CONV, g, 2,
+				"chat", 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/sys_msg.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/qq/sys_msg.c	Fri Nov 16 23:27:01 2007 +0000
@@ -86,7 +86,7 @@
 	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,
+		 "chat", 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 @@
 	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,
+		 "buddy", g, 2,
 		 _("Cancel"), NULL,
 		 _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid));
 	g_free(nombre);
@@ -168,7 +168,7 @@
 		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,
+					"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 @@
 	purple_request_action_with_hint
 	    (gc, NULL, message, reason, 2,
 		purple_connection_get_account(gc), name, NULL,
-		 PURPLE_REQUEST_HINT_BUDDY, g, 3,
+		 "buddy", g, 3,
 	     _("Reject"),
 	     G_CALLBACK(qq_reject_add_request_with_gc_and_uid),
 	     _("Approve"),
@@ -262,7 +262,7 @@
 		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,
+					"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));
--- a/libpurple/protocols/sametime/sametime.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Fri Nov 16 23:27:01 2007 +0000
@@ -3387,7 +3387,7 @@
 		      _("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);
+		      "chat", buddy);
   g_free(msg1);
 }
 
@@ -3473,7 +3473,7 @@
 		      _("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);
+		      "chat", buddy);
   g_free(msg);
 }
 
@@ -3644,7 +3644,7 @@
 		     _("Connect"), G_CALLBACK(prompt_host_ok_cb),
 		     _("Cancel"), G_CALLBACK(prompt_host_cancel_cb),
 			 acct, NULL, NULL,
-		     PURPLE_REQUEST_HINT_CONV, gc);
+		     "account", gc);
 
   g_free(msg);
 }
@@ -5218,7 +5218,7 @@
   purple_request_file_with_hint(gc, title, NULL, FALSE,
 		    G_CALLBACK(st_import_action_cb), NULL,
 		    account, NULL, NULL,
-		    PURPLE_REQUEST_HINT_CONV, gc);
+		    "blist", gc);
 
   g_free(title);
 }
@@ -5258,7 +5258,7 @@
   purple_request_file_with_hint(gc, title, NULL, TRUE,
 		    G_CALLBACK(st_export_action_cb), NULL,
 			account, NULL, NULL,
-		    PURPLE_REQUEST_HINT_CONV, gc);
+		    "blist", gc);
 
   g_free(title);
 }
@@ -5396,7 +5396,7 @@
 		      _("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);
+		      "blist", pd);
 
   g_free(msg);
 }
@@ -5486,7 +5486,7 @@
 		     _("Add"), G_CALLBACK(remote_group_action_cb),
 		     _("Cancel"), NULL,
 			 purple_connection_get_account(gc), NULL, NULL,
-		     PURPLE_REQUEST_HINT_BLIST, gc);
+		     "blist", gc);
 }
 
 
@@ -5611,7 +5611,7 @@
 		     _("Search"), G_CALLBACK(search_action_cb),
 		     _("Cancel"), NULL,
 			 purple_connection_get_account(gc), NULL, NULL,
-			 PURPLE_REQUEST_HINT_BLIST, gc);
+			 "blist", gc);
 }
 
 
--- a/libpurple/protocols/silc/buddy.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/buddy.c	Fri Nov 16 23:27:01 2007 +0000
@@ -314,7 +314,7 @@
 
 	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, "blist", a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
 			      _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
 }
 
@@ -453,7 +453,7 @@
 	                     _("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, "blist", p);
 
 	silc_client_list_free(sg->client, sg->conn, clients);
 }
@@ -1059,7 +1059,7 @@
 	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, "blist", r);
 
 }
 
@@ -1072,7 +1072,7 @@
 	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, "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 @@
 			      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, "blist", r);
 }
 
 static void
--- a/libpurple/protocols/silc/chat.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/chat.c	Fri Nov 16 23:27:01 2007 +0000
@@ -304,7 +304,7 @@
 		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, "conversation", sgc);
 		return;
 	}
 
@@ -445,7 +445,7 @@
 				      _("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, "conversation", sgc);
 		if (channel_pubkeys)
 		  silc_dlist_uninit(channel_pubkeys);
 		return;
@@ -480,7 +480,7 @@
 			      _("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, "conversation", sgc);
 }
 
 static void
@@ -614,7 +614,7 @@
 	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, "conversation", p);
 }
 
 
@@ -744,7 +744,7 @@
 			   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, "conversation", s);
 }
 
 static void
--- a/libpurple/protocols/silc/ops.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/ops.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1814,7 +1814,7 @@
 			     _("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, "blist", internal);
 }
 
 
--- a/libpurple/protocols/silc/pk.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/pk.c	Fri Nov 16 23:27:01 2007 +0000
@@ -109,7 +109,7 @@
 
 	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, "blist", 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	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/silc.c	Fri Nov 16 23:27:01 2007 +0000
@@ -821,7 +821,7 @@
 			    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, "blist", gc);
 }
 
 static void
@@ -1029,7 +1029,7 @@
 			      _("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, "blist", gc);
 
 	g_strfreev(u);
 	silc_free(hostname);
--- a/libpurple/protocols/silc/util.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/util.c	Fri Nov 16 23:27:01 2007 +0000
@@ -379,7 +379,7 @@
 	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, "blist", context, 1, _("Close"), callback);
 
 	g_free(buf);
 	silc_free(fingerprint);
--- a/libpurple/protocols/silc/wb.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc/wb.c	Fri Nov 16 23:27:01 2007 +0000
@@ -300,7 +300,7 @@
 	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, "blist", req, 2,
 			    _("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_wb_request_cb));
 }
--- a/libpurple/protocols/silc10/buddy.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/buddy.c	Fri Nov 16 23:27:01 2007 +0000
@@ -311,7 +311,7 @@
 
 	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, "blist", 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
 }
 
@@ -466,7 +466,7 @@
 	                     _("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, "blist", p);
 
 	silc_free(clients);
 	silc_free(nickname);
@@ -1067,7 +1067,7 @@
 	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, "blist", r);
 
 }
 
@@ -1080,7 +1080,7 @@
 	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, "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 @@
 				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, "blist", r);
 }
 
 static void
--- a/libpurple/protocols/silc10/chat.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/chat.c	Fri Nov 16 23:27:01 2007 +0000
@@ -291,7 +291,7 @@
 		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, "conversation", sgc);
 		return;
 	}
 
@@ -423,7 +423,7 @@
 				    _("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, "conversation", sgc);
 		return;
 	}
 	sgc->pubkeys = silc_buffer_copy(channel_pubkeys);
@@ -462,7 +462,7 @@
 			    _("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, "cnoversation", sgc);
 
 	silc_argument_payload_free(chpks);
 }
@@ -598,7 +598,7 @@
 	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, "conversation", p);
 }
 
 
@@ -728,7 +728,7 @@
 			   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, "conversation", s);
 }
 
 static void
--- a/libpurple/protocols/silc10/ops.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/ops.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1293,7 +1293,7 @@
 			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, "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 @@
 			   _("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, "blist", internal);
 }
 
 
--- a/libpurple/protocols/silc10/pk.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/pk.c	Fri Nov 16 23:27:01 2007 +0000
@@ -115,7 +115,7 @@
 
 	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, "blist", 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	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/silc.c	Fri Nov 16 23:27:01 2007 +0000
@@ -734,7 +734,7 @@
 			    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, "blist", gc);
 }
 
 static void
--- a/libpurple/protocols/silc10/util.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/util.c	Fri Nov 16 23:27:01 2007 +0000
@@ -374,7 +374,7 @@
 	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, "blist", 1, _("Close"), callback);
 
 	g_free(buf);
 	silc_free(fingerprint);
--- a/libpurple/protocols/silc10/wb.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/silc10/wb.c	Fri Nov 16 23:27:01 2007 +0000
@@ -300,7 +300,7 @@
 	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, "conversation", req, 2,
 			    _("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_wb_request_cb));
 }
--- a/libpurple/protocols/toc/toc.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/toc/toc.c	Fri Nov 16 23:27:01 2007 +0000
@@ -2217,7 +2217,7 @@
 	}
 
 	purple_request_accept_cancel_with_hint(ft->gc, NULL, buf, NULL, 
-							   PURPLE_DEFAULT_ACTION_NONE, PURPLE_REQUEST_HINT_XFER, ft,
+							   PURPLE_DEFAULT_ACTION_NONE, "xfer", ft,
 							   G_CALLBACK(toc_accept_ft),
 							   G_CALLBACK(toc_reject_ft));
 }
--- a/libpurple/protocols/yahoo/yahoo.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1033,7 +1033,7 @@
 			_("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);
+			"blist", add_req);
 }
 
 static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason)
@@ -2067,7 +2067,7 @@
 					"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,
+						"blist", b,
 						G_CALLBACK(ignore_buddy),
 						G_CALLBACK(keep_buddy));
 		break;
@@ -3499,7 +3499,7 @@
 					   _("OK"), G_CALLBACK(yahoo_act_id),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_ACCOUNT, gc);
+					   "account", gc);
 }
 
 static void yahoo_show_chat_goto(PurplePluginAction *action)
@@ -3510,7 +3510,7 @@
 					   _("OK"), G_CALLBACK(yahoo_chat_goto),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_HINT_CONV, gc);
+					   "chat", gc);
 }
 
 static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
--- a/libpurple/request.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/request.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1230,7 +1230,7 @@
 {
 	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, "blist", user_data);
 }
 
 void *
@@ -1289,7 +1289,7 @@
 	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, "blist", user_data, args);
 	va_end(args);
 
 	return ui_handle;
@@ -1330,7 +1330,7 @@
 {
 	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, "blist", user_data, choices);
 }
 
 void *
@@ -1384,7 +1384,7 @@
 	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);
+										 "blist", user_data, action_count, args);
 	va_end(args);
 
 	return ui_handle;
@@ -1419,7 +1419,7 @@
 {
 	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);
+		"blist", user_data, action_count, actions);
 }
 
 void *
@@ -1463,7 +1463,7 @@
 {
 	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, "blist", user_data);
 }
 
 void *
@@ -1510,7 +1510,7 @@
 				  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, "blist", user_data);
 }
 
 void *
@@ -1547,7 +1547,7 @@
 				  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, "blist", user_data);
 }
 
 void *
--- a/libpurple/request.h	Sun Oct 14 18:07:19 2007 +0000
+++ b/libpurple/request.h	Fri Nov 16 23:27:01 2007 +0000
@@ -199,28 +199,6 @@
 } PurpleRequestField;
 
 /**
- * List of UI hints used by purple
- */
-#define PURPLE_REQUEST_HINT_ACCOUNT  "account"
-#define PURPLE_REQUEST_HINT_BLIST    "blist"
-#define PURPLE_REQUEST_HINT_BUDDY    "buddy"
-#define PURPLE_REQUEST_HINT_CONV     "conversation"
-#define PURPLE_REQUEST_HINT_REGISTER "register-account"
-#define PURPLE_REQUEST_HINT_XFER     "xfer"
-
-/**
- * List of UI hints used by purple UIs
- * We need a header file included by both pidgin and finch, but not part of
- * libpurple for these
- */
-#define PURPLE_UI_REQUEST_HINT_ACCOUNTMGR "accountmgr"
-#define PURPLE_UI_REQUEST_HINT_CERTMGR    "certmgr"
-#define PURPLE_UI_REQUEST_HINT_PLUGINMGR  "pluginmgr"
-#define PURPLE_UI_REQUEST_HINT_POUNCEMGR  "pouncemgr"
-#define PURPLE_UI_REQUEST_HINT_PREFSMGR   "preferences"
-#define PURPLE_UI_REQUEST_HINT_STATUSMGR  "statusmgr"
-
-/**
  * Request UI operations.
  */
 typedef struct
--- a/pidgin/gtkaccount.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkaccount.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1904,7 +1904,7 @@
 		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,
+							"accounts", account, 2,
 							_("Delete"), delete_account_cb,
 							_("Cancel"), NULL);
 		g_free(buf);
--- a/pidgin/gtkblist.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Nov 16 23:27:01 2007 +0000
@@ -524,7 +524,7 @@
 		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));
+				      "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 @@
 	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,
+						"account", account, 3,
 						_("OK"), NULL,
 						_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
 						enabled ? _("Connect") : _("Re-enable Account"),
@@ -5787,7 +5787,7 @@
 	gtkblist = PIDGIN_BLIST(purple_get_blist());
 
 	data->window = gtk_dialog_new_with_buttons(_("Add Buddy"),
-			gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_NO_SEPARATOR,
+			gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_ADD, GTK_RESPONSE_OK,
 			NULL);
@@ -6171,7 +6171,7 @@
 	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	data->window = gtk_dialog_new_with_buttons(_("Add Chat"),
-		gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_NO_SEPARATOR,
+		gtkblist ? gtkblist->window : NULL, GTK_DIALOG_NO_SEPARATOR,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_ADD, GTK_RESPONSE_OK,
 		NULL);
@@ -6287,7 +6287,7 @@
 					   _("Add"), G_CALLBACK(add_group_cb),
 					   _("Cancel"), NULL,
 					   NULL, NULL, NULL,
-					   PURPLE_REQUEST_HINT_BLIST, NULL);
+					   "blist", NULL);
 }
 
 void
--- a/pidgin/gtkcertmgr.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkcertmgr.c	Fri Nov 16 23:27:01 2007 +0000
@@ -197,7 +197,7 @@
 				     _("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*/
+				     "certmgr", crt    /* Pass cert instance to callback*/
 				     );
 		
 		g_free(default_hostname);
@@ -226,7 +226,7 @@
 			    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, "certmgr", NULL );/* No account,conv,etc. */
 }
 
 static void
@@ -302,7 +302,7 @@
 			    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 */
+			    "certmgr", crt); /* Pass the certificate on to the callback */
 }
 
 static void
@@ -375,7 +375,7 @@
 				      primary, NULL, /* Can this be NULL? */
 				      2, /* NO is default action */
 				      NULL, NULL, NULL,
-				      PURPLE_UI_REQUEST_HINT_CERTMGR,
+				      "certmgr",
 				      id, /* id ownership passed to callback */
 				      tls_peers_mgmt_delete_confirm_cb,
 				      tls_peers_mgmt_delete_confirm_cb );
--- a/pidgin/gtkconv.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1033,7 +1033,7 @@
 					  buf,
 					  TRUE, G_CALLBACK(savelog_writefile_cb), NULL,
 					  NULL, NULL, conv,
-					  PURPLE_REQUEST_HINT_BLIST, conv);
+					  "conversation", conv);
 
 	g_free(buf);
 }
@@ -2721,7 +2721,7 @@
 	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);
+					"conversation", gtkconv);
 
 	g_free(buf);
 }
--- a/pidgin/gtkdebug.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkdebug.c	Fri Nov 16 23:27:01 2007 +0000
@@ -235,7 +235,7 @@
 	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);
+					  "blist", win);
 }
 
 static void
--- a/pidgin/gtkdialogs.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkdialogs.c	Fri Nov 16 23:27:01 2007 +0000
@@ -787,7 +787,7 @@
 						_("OK"), G_CALLBACK(pidgin_dialogs_im_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, NULL);
+						"blist", NULL);
 }
 
 void
@@ -926,7 +926,7 @@
 						_("OK"), G_CALLBACK(pidgin_dialogs_info_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, NULL);
+						"blist", NULL);
 }
 
 static void
@@ -1018,7 +1018,7 @@
 						_("OK"), G_CALLBACK(pidgin_dialogs_log_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, NULL);
+						"blist", NULL);
 }
 
 static void
@@ -1038,7 +1038,7 @@
 					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_contact_cb),
 					   _("Cancel"), NULL,
 					   NULL, purple_contact_get_alias(contact), NULL,
-					   PURPLE_REQUEST_HINT_BLIST, contact);
+					   "blist", contact);
 }
 
 static void
@@ -1062,7 +1062,7 @@
 					   _("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);
+					   "blist", buddy);
 
 	g_free(secondary);
 }
@@ -1084,7 +1084,7 @@
 					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb),
 					   _("Cancel"), NULL,
 					   chat->account, NULL, NULL,
-					   PURPLE_REQUEST_HINT_BLIST, chat);
+					   "blist", chat);
 }
 
 static void
@@ -1128,7 +1128,7 @@
 
 		purple_request_action_with_hint(contact, NULL, _("Remove Contact"), text, 0,
 				NULL, purple_contact_get_alias(contact), NULL,
-				PURPLE_REQUEST_HINT_BLIST, contact, 2,
+				"blist", contact, 2,
 				_("_Remove Contact"), G_CALLBACK(pidgin_dialogs_remove_contact_cb),
 				_("Cancel"),
 				NULL);
@@ -1169,7 +1169,7 @@
 	
 	purple_request_action_with_hint(source, NULL, _("Merge Groups"), text, 0,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_HINT_BLIST, ggp, 2,
+			"blist", ggp, 2,
 			_("_Merge Groups"), G_CALLBACK(pidgin_dialogs_merge_groups_cb),
 			_("Cancel"), G_CALLBACK(free_ggmo));
 
@@ -1225,7 +1225,7 @@
 
 	purple_request_action_with_hint(group, NULL, _("Remove Group"), text, 0,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, group, 2,
+						"blist", group, 2,
 						_("_Remove Group"), G_CALLBACK(pidgin_dialogs_remove_group_cb),
 						_("Cancel"), NULL);
 
@@ -1264,7 +1264,7 @@
 
 	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,
+						"blist", buddy, 2,
 						_("_Remove Buddy"), G_CALLBACK(pidgin_dialogs_remove_buddy_cb),
 						_("Cancel"), NULL);
 
@@ -1291,7 +1291,7 @@
 
 	purple_request_action_with_hint(chat, NULL, _("Remove Chat"), text, 0,
 						chat->account, NULL, NULL,
-						PURPLE_REQUEST_HINT_BLIST, chat, 2,
+						"blist", chat, 2,
 						_("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb),
 						_("Cancel"), NULL);
 
--- a/pidgin/gtkimhtmltoolbar.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Fri Nov 16 23:27:01 2007 +0000
@@ -436,7 +436,7 @@
 					    _("_Insert"), G_CALLBACK(do_insert_link_cb),
 					    _("Cancel"), G_CALLBACK(cancel_link_cb),
 					    NULL, NULL, NULL,
-					    PURPLE_REQUEST_HINT_CONV, toolbar);
+					    "conversation", toolbar);
 		g_free(msg);
 		g_free(desc);
 	} else {
--- a/pidgin/gtkplugin.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkplugin.c	Fri Nov 16 23:27:01 2007 +0000
@@ -284,7 +284,7 @@
 			                    _("Multiple plugins will be unloaded."),
 			                    tmp->str, 0,
 			                    NULL, NULL, NULL,
-			                    PURPLE_UI_REQUEST_HINT_PLUGINMGR, cb_data, 2,
+			                    "plugins", cb_data, 2,
 			                    _("Unload Plugins"), G_CALLBACK(plugin_unload_confirm_cb),
 			                    _("Cancel"), g_free);
 			g_string_free(tmp, TRUE);
--- a/pidgin/gtkpounce.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkpounce.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1110,7 +1110,7 @@
 	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,
+						"pounces", pounce, 2,
 						_("Delete"), pounces_manager_delete_confirm_cb,
 						_("Cancel"), NULL);
 	g_free(buf);
--- a/pidgin/gtkprefs.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkprefs.c	Fri Nov 16 23:27:01 2007 +0000
@@ -642,7 +642,7 @@
 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, "preferences", NULL) ;
 }
 
 static void
@@ -1627,7 +1627,7 @@
 
 	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, "preferences",
 					  GINT_TO_POINTER(sound_row_sel));
 }
 
--- a/pidgin/gtksavedstatuses.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Fri Nov 16 23:27:01 2007 +0000
@@ -340,7 +340,7 @@
 
 	purple_request_action_with_hint(handle, NULL, title, NULL, 0,
 		 NULL, NULL, NULL,
-		 PURPLE_UI_REQUEST_HINT_STATUSMGR, sel_titles, 2,
+		 "statuses", sel_titles, 2,
 		_("Delete"), status_window_delete_confirm_cb,
 		_("Cancel"), status_window_delete_cancel_cb);
 
--- a/pidgin/gtkutils.c	Sun Oct 14 18:07:19 2007 +0000
+++ b/pidgin/gtkutils.c	Fri Nov 16 23:27:01 2007 +0000
@@ -1537,7 +1537,7 @@
 						    DND_FILE_TRANSFER, "OK", (GCallback)dnd_image_ok_callback,
 						    "Cancel", (GCallback)dnd_image_cancel_callback,
 							account, who, NULL,
-							PURPLE_REQUEST_HINT_CONV, data,
+							"conversation", data,
 							_("Set as buddy icon"), DND_BUDDY_ICON,
 						    _("Send image file"), DND_FILE_TRANSFER,
 						    _("Insert in message"), DND_IM_IMAGE,
@@ -1547,7 +1547,7 @@
 							_("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);
+							"conversation", 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 @@
 							"OK", (GCallback)dnd_image_ok_callback,
 						    "Cancel", (GCallback)dnd_image_cancel_callback,
 							account, who, NULL,
-							PURPLE_REQUEST_HINT_CONV, data,
+							"conversation", data,
 						    _("Set as buddy icon"), DND_BUDDY_ICON,
 						    (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE),
 							NULL);