diff libpurple/account.c @ 21560:665e04562de0

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

--- a/libpurple/account.c	Fri Nov 16 03:39:04 2007 +0000
+++ b/libpurple/account.c	Sat Nov 17 00:12:30 2007 +0000
@@ -1096,7 +1096,7 @@
 	field = purple_request_field_bool_new("remember", _("Save password"), FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(account,
+	purple_request_fields(account,
                         NULL,
                         primary,
                         NULL,
@@ -1104,7 +1104,7 @@
                         _("OK"), ok_cb,
                         _("Cancel"), cancel_cb,
 						account, NULL, NULL,
-                        PURPLE_REQUEST_UI_HINT_ACCOUNT, user_data);
+                        user_data);
 	g_free(primary);
 }
 
@@ -1384,7 +1384,7 @@
 
 	/* I'm sticking this somewhere in the code: bologna */
 
-	purple_request_fields_with_hint(purple_account_get_connection(account),
+	purple_request_fields(purple_account_get_connection(account),
 						NULL,
 						primary,
 						_("Please enter your current password and your "
@@ -1393,7 +1393,7 @@
 						_("OK"), G_CALLBACK(change_password_cb),
 						_("Cancel"), NULL,
 						account, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, account);
+						account);
 }
 
 static void
@@ -1421,14 +1421,14 @@
 			   _("Change user information for %s"),
 			   purple_account_get_username(account));
 
-	purple_request_input_with_hint(gc, _("Set User Info"), primary, NULL,
+	purple_request_input(gc, _("Set User Info"), primary, NULL,
 					   purple_account_get_user_info(account),
 					   TRUE, FALSE, ((gc != NULL) &&
 					   (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL),
 					   _("Save"), G_CALLBACK(set_user_info_cb),
 					   _("Cancel"), NULL,
 					   account, NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, account);
+					   account);
 }
 
 void