diff libpurple/protocols/qq/group_opt.c @ 16442:08db93bbd798

Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.

--- a/libpurple/protocols/qq/group_opt.c	Thu Apr 26 10:49:27 2007 +0000
+++ b/libpurple/protocols/qq/group_opt.c	Thu Apr 26 12:25:49 2007 +0000
@@ -120,29 +120,33 @@
 	g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0);
 
 	qq_send_packet_get_info(g->gc, g->member, TRUE);	/* we wanna see window */
-	purple_request_action
-	    (g->gc, NULL, _("Do you wanna approve the request?"), "", 2, g,
-	     2, _("Reject"),
-	     G_CALLBACK(qq_group_reject_application_with_struct),
-	     _("Approve"), G_CALLBACK(qq_group_approve_application_with_struct));
+	purple_request_action(g->gc, NULL, _("Do you wanna approve the request?"), "", 2,
+					purple_connection_get_account(g->gc), NULL, NULL,
+					g, 2,
+					_("Reject"), G_CALLBACK(qq_group_reject_application_with_struct),
+					_("Approve"), G_CALLBACK(qq_group_approve_application_with_struct));
 }
 
 void qq_group_reject_application_with_struct(group_member_opt *g)
 {
-	gchar *msg1, *msg2;
+	gchar *msg1, *msg2, *nombre;
 	g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0);
 
 	msg1 = g_strdup_printf(_("You rejected %d's request"), g->member);
 	msg2 = g_strdup(_("Input your reason:"));
 
-	purple_request_input(g->gc, NULL, msg1, msg2,
-			   _("Sorry, you are not my type..."), TRUE, FALSE,
-			   NULL, _("Send"),
-			   G_CALLBACK(_qq_group_reject_application_real),
-			   _("Cancel"), G_CALLBACK(_qq_group_do_nothing_with_struct), g);
+	nombre = uid_to_purple_name(g->member);
+	purple_request_input(g->gc, /* title */ NULL, msg1, msg2,
+			   _("Sorry, you are not my type..."), /* multiline */ TRUE, /* masked */ FALSE,
+			   /* hint */ NULL,
+			   _("Send"), G_CALLBACK(_qq_group_reject_application_real),
+			   _("Cancel"), G_CALLBACK(_qq_group_do_nothing_with_struct),
+			   purple_connection_get_account(g->gc), nombre, NULL,
+			   g);
 
 	g_free(msg1);
 	g_free(msg2);
+	g_free(nombre);
 }
 
 void qq_group_approve_application_with_struct(group_member_opt *g)
@@ -387,8 +391,10 @@
 			    _("You have successfully created a Qun"),
 			    _
 			    ("Would you like to set up the Qun details now?"),
-			    1, g, 2, _("Setup"),
-			    G_CALLBACK(qq_group_setup_with_gc_and_uid),
+			    1,
+				purple_connection_get_account(gc), NULL, NULL,
+				g, 2,
+				_("Setup"), G_CALLBACK(qq_group_setup_with_gc_and_uid),
 			    _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid));
 }