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

This merge has the effect of reverting the hinting code from trunk.
author Richard Laager <rlaager@wiktel.com>
date Sat, 17 Nov 2007 00:12:30 +0000
parents be50064a83e0 fcb848b2d669
children 252b96b6a32c 60f5abc6cf0c
line wrap: on
line diff
--- a/libpurple/protocols/gg/gg.c	Fri Nov 16 03:39:04 2007 +0000
+++ b/libpurple/protocols/gg/gg.c	Sat Nov 17 00:12:30 2007 +0000
@@ -329,10 +329,10 @@
 {
 	PurpleConnection *gc = (PurpleConnection *)action->context;
 
-	purple_request_file_with_hint(action, _("Save buddylist..."), NULL, TRUE,
+	purple_request_file(action, _("Save buddylist..."), NULL, TRUE,
 			G_CALLBACK(ggp_callback_buddylist_save_ok), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, gc);
+			gc);
 }
 /* }}} */
 
@@ -343,10 +343,10 @@
 {
 	PurpleConnection *gc = (PurpleConnection *)action->context;
 
-	purple_request_file_with_hint(action, "Load buddylist from file...", NULL, FALSE,
+	purple_request_file(action, "Load buddylist from file...", NULL, FALSE,
 			G_CALLBACK(ggp_callback_buddylist_load_ok), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, gc);
+			gc);
 }
 /* }}} */
 
@@ -499,7 +499,7 @@
 			_("Current token"), token->data, token->size);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(account,
+	purple_request_fields(account,
 		_("Register New Gadu-Gadu Account"),
 		_("Register New Gadu-Gadu Account"),
 		_("Please, fill in the following fields"),
@@ -507,7 +507,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_UI_HINT_REGISTER, gc);
+		gc);
 }
 /* }}} */
 
@@ -658,7 +658,7 @@
 			_("Only online"), FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(gc,
+	purple_request_fields(gc,
 		_("Find buddies"),
 		_("Find buddies"),
 		_("Please, enter your search criteria below"),
@@ -666,7 +666,7 @@
 		_("OK"), G_CALLBACK(ggp_callback_find_buddies),
 		_("Cancel"), NULL,
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_UI_HINT_BLIST, gc);
+		gc);
 }
 /* }}} */
 
@@ -796,14 +796,14 @@
 		_("Please, enter your current password and your new password for UIN: "),
 		ggp_get_uin(purple_connection_get_account(gc)));
 
-	purple_request_fields_with_hint(gc,
+	purple_request_fields(gc,
 		_("Change Gadu-Gadu Password"),
 		_("Change Gadu-Gadu Password"),
 		msg,
 		fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok),
 		_("Cancel"), NULL,
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+		gc);
 
 	g_free(msg);
 }
@@ -877,7 +877,7 @@
 
 	msg = g_strdup_printf(_("Select a chat for buddy: %s"),
 			      purple_buddy_get_alias(buddy));
-	purple_request_fields_with_hint(gc,
+	purple_request_fields(gc,
 			_("Add to chat..."),
 			_("Add to chat..."),
 			msg,
@@ -885,7 +885,7 @@
 			_("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,			  
-			PURPLE_REQUEST_UI_HINT_BUDDY, gc);
+			gc);
 	g_free(msg);
 }
 /* }}} */