diff libpurple/protocols/jabber/jabber.c @ 21560:665e04562de0

This merge has the effect of reverting the hinting code from trunk.

--- a/libpurple/protocols/jabber/jabber.c	Fri Nov 16 03:39:04 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Nov 17 00:12:30 2007 +0000
@@ -1029,21 +1029,21 @@
 	cbdata->who = g_strdup(from);
 
 	if(js->registration)
-		purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"),
+		purple_request_fields(js->gc, _("Register New XMPP Account"),
 				_("Register New XMPP Account"), instructions, fields,
 				_("Register"), G_CALLBACK(jabber_register_cb),
 				_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
-				PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
+				cbdata);
 	else {
 		char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
 								:g_strdup_printf(_("Register New Account at %s"), from);
-		purple_request_fields_with_hint(js->gc, title,
+		purple_request_fields(js->gc, title,
 			  title, instructions, fields,
 			  registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
 			  _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 			  purple_connection_get_account(js->gc), NULL, NULL,
-			  PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
+			  cbdata);
 		g_free(title);
 	}
 
@@ -1740,12 +1740,12 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(js->gc, _("Change XMPP Password"),
+	purple_request_fields(js->gc, _("Change XMPP Password"),
 			_("Change XMPP Password"), _("Please enter your new password"),
 			fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
+			js);
 }
 
 GList *jabber_actions(PurplePlugin *plugin, gpointer context)