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

merge of '76c07fcb434a2a7aa289734bb221c171a376d73b' and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'

--- a/libpurple/protocols/qq/group_join.c	Sun Nov 11 16:45:19 2007 +0000
+++ b/libpurple/protocols/qq/group_join.c	Sat Nov 17 17:27:48 2007 +0000
@@ -132,14 +132,14 @@
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
 	g->uid = group->internal_group_id;
-	purple_request_input_with_hint(gc, NULL, msg,
+	purple_request_input(gc, NULL, msg,
 			   _("Input request here"),
 			   _("Would you be my friend?"), TRUE, FALSE, NULL,
 			   _("Send"),
 			   G_CALLBACK(_qq_group_join_auth_with_gc_and_id),
 			   _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid),
 			   purple_connection_get_account(gc), group->group_name_utf8, NULL,
-			   PURPLE_REQUEST_UI_HINT_CONV, g);
+			   g);
 	g_free(msg);
 }
 
@@ -356,13 +356,13 @@
 	g->gc = gc;
 	g->uid = internal_group_id;
 
-	purple_request_action_with_hint(gc, _("QQ Qun Operation"),
+	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("Are you sure you want to leave this Qun?"),
 			    _
 			    ("Note, if you are the creator, \nthis operation will eventually remove this Qun."),
 			    1,
 				purple_connection_get_account(gc), NULL, NULL,
-			    PURPLE_REQUEST_UI_HINT_CONV, g, 2, _("Cancel"),
+			    g, 2, _("Cancel"),
 			    G_CALLBACK(qq_do_nothing_with_gc_and_uid),
 			    _("Continue"), G_CALLBACK(_qq_group_exit_with_gc_and_id));
 }