diff libpurple/protocols/qq/sys_msg.c @ 21570:dccfd999ffe7

merge of '76c07fcb434a2a7aa289734bb221c171a376d73b' and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'

--- a/libpurple/protocols/qq/sys_msg.c	Sun Nov 11 16:45:19 2007 +0000
+++ b/libpurple/protocols/qq/sys_msg.c	Sat Nov 17 17:27:48 2007 +0000
@@ -83,10 +83,10 @@
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 
 	nombre = uid_to_purple_name(uid);
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, _("Do you want to approve the request?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
-		 PURPLE_REQUEST_UI_HINT_CONV, g, 2,
+		 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);
@@ -106,11 +106,11 @@
 
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 	nombre = uid_to_purple_name(uid);
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, _("Do you want to add this buddy?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
-		 PURPLE_REQUEST_UI_HINT_BUDDY, g, 2,
-		 _("Cancel"), NULL,
+		 g, 2,
+	     _("Cancel"), NULL,
 		 _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid));
 	g_free(nombre);
 }
@@ -165,10 +165,10 @@
 		g->uid = uid;	/* only need to get value */
 		message = g_strdup_printf(_("You have been added by %s"), from);
 		_qq_sys_msg_log_write(gc, message, from);
-		purple_request_action_with_hint(gc, NULL, message,
+		purple_request_action(gc, NULL, message,
 				    _("Would you like to add him?"), 2,
 					purple_connection_get_account(gc), name, NULL,
-					PURPLE_REQUEST_UI_HINT_BUDDY, g, 3,
+					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));
@@ -239,10 +239,10 @@
 	reason = g_strdup_printf(_("Message: %s"), msg_utf8);
 	_qq_sys_msg_log_write(gc, message, from);
 
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, message, reason, 2,
 		purple_connection_get_account(gc), name, NULL,
-		 PURPLE_REQUEST_UI_HINT_BUDDY, g, 3,
+		 g, 3,
 	     _("Reject"),
 	     G_CALLBACK(qq_reject_add_request_with_gc_and_uid),
 	     _("Approve"),
@@ -259,10 +259,10 @@
 		g2->gc = gc;
 		g2->uid = strtol(from, NULL, 10);
 		message = g_strdup_printf(_("%s is not in your buddy list"), from);
-		purple_request_action_with_hint(gc, NULL, message,
+		purple_request_action(gc, NULL, message,
 				    _("Would you like to add him?"), 2,
 					purple_connection_get_account(gc), name, NULL,
-					PURPLE_REQUEST_UI_HINT_BLIST, g2, 3,
+					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));