Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/buddy.c	Fri Nov 16 03:39:04 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sat Nov 17 00:12:30 2007 +0000
@@ -719,7 +719,7 @@
 	if(x_vc_data != NULL)
 		xmlnode_free(x_vc_data);
 
-	purple_request_fields_with_hint(gc, _("Edit XMPP vCard"),
+	purple_request_fields(gc, _("Edit XMPP vCard"),
 						_("Edit XMPP vCard"),
 						_("All items below are optional. Enter only the "
 						  "information with which you feel comfortable."),
@@ -727,7 +727,7 @@
 						_("Save"), G_CALLBACK(jabber_format_info),
 						_("Cancel"), NULL,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+						gc);
 }
 
 /*---------------------------------------*/
@@ -2420,12 +2420,12 @@
 		usi->js = js;
 		usi->directory_server = g_strdup(from);
 
-		purple_request_fields_with_hint(js->gc, _("Search for XMPP users"),
+		purple_request_fields(js->gc, _("Search for XMPP users"),
 				_("Search for XMPP users"), instructions, fields,
 				_("Search"), G_CALLBACK(user_search_cb),
 				_("Cancel"), G_CALLBACK(user_search_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
-				PURPLE_REQUEST_UI_HINT_ACCOUNT, usi);
+				usi);
 
 		g_free(instructions);
 	}
@@ -2454,14 +2454,14 @@
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	JabberStream *js = gc->proto_data;
 
-	purple_request_input_with_hint(gc, _("Enter a User Directory"), _("Enter a User Directory"),
+	purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"),
 			_("Select a user directory to search"),
 			js->user_directories ? js->user_directories->data : NULL,
 			FALSE, FALSE, NULL,
 			_("Search Directory"), PURPLE_CALLBACK(jabber_user_search),
 			_("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
+			js);
 }