# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1200555415 0
# Node ID 8515997d66e923182f475b0ba0d719aa49f7d8b6
# Parent  6dab6629497a8ddd0f8e7f8e8156df9ed1412c4b
Minor improvements to the default_action used in purple_action_request

diff -r 6dab6629497a -r 8515997d66e9 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Thu Jan 17 07:26:57 2008 +0000
+++ b/libpurple/protocols/msn/msn.c	Thu Jan 17 07:36:55 2008 +0000
@@ -351,7 +351,7 @@
 						_("Do you want to allow or disallow people on "
 						  "your buddy list to send you MSN Mobile pages "
 						  "to your cell phone or other mobile device?"),
-						-1,
+						PURPLE_DEFAULT_ACTION_NONE,
 						purple_connection_get_account(gc), NULL, NULL,
 						gc, 3,
 						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
diff -r 6dab6629497a -r 8515997d66e9 libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Thu Jan 17 07:26:57 2008 +0000
+++ b/libpurple/protocols/novell/novell.c	Thu Jan 17 07:36:55 2008 +0000
@@ -1920,6 +1920,7 @@
 	parms = g_slist_append(parms, nm_event_get_conference(event));
 
 	/* Prompt the user */
+	/* TODO: Would it be better to use serv_got_chat_invite() here? */
 	gc = purple_account_get_connection(user->client_data);
 	purple_request_action(gc, title, primary, secondary,
 						PURPLE_DEFAULT_ACTION_NONE,
diff -r 6dab6629497a -r 8515997d66e9 libpurple/protocols/qq/group_im.c
--- a/libpurple/protocols/qq/group_im.c	Thu Jan 17 07:26:57 2008 +0000
+++ b/libpurple/protocols/qq/group_im.c	Thu Jan 17 07:36:55 2008 +0000
@@ -135,7 +135,7 @@
 
 	purple_request_action(gc, _("QQ Qun Operation"),
 			    msg, reason,
-			    2,
+			    PURPLE_DEFAULT_ACTION_NONE,
 				purple_connection_get_account(gc), nombre, NULL,
 				g, 3,
 			    _("Approve"),
diff -r 6dab6629497a -r 8515997d66e9 libpurple/protocols/qq/group_opt.c
--- a/libpurple/protocols/qq/group_opt.c	Thu Jan 17 07:26:57 2008 +0000
+++ b/libpurple/protocols/qq/group_opt.c	Thu Jan 17 07:36:55 2008 +0000
@@ -96,7 +96,8 @@
 	g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0);
 
 	qq_send_packet_get_info(g->gc, g->member, TRUE);	/* we want to see window */
-	purple_request_action(g->gc, NULL, _("Do you want to approve the request?"), "", 2,
+	purple_request_action(g->gc, NULL, _("Do you want to approve the request?"), "",
+					PURPLE_DEFAULT_ACTION_NONE,
 					purple_connection_get_account(g->gc), NULL, NULL,
 					g, 2,
 					_("Reject"), G_CALLBACK(qq_group_reject_application_with_struct),
diff -r 6dab6629497a -r 8515997d66e9 libpurple/protocols/qq/sys_msg.c
--- a/libpurple/protocols/qq/sys_msg.c	Thu Jan 17 07:26:57 2008 +0000
+++ b/libpurple/protocols/qq/sys_msg.c	Thu Jan 17 07:36:55 2008 +0000
@@ -84,7 +84,8 @@
 
 	nombre = uid_to_purple_name(uid);
 	purple_request_action
-	    (gc, NULL, _("Do you want to approve the request?"), "", 2,
+	    (gc, NULL, _("Do you want to approve the request?"), "",
+		PURPLE_DEFAULT_ACTION_NONE,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 g, 2,
 	     _("Reject"), G_CALLBACK(qq_reject_add_request_with_gc_and_uid),
@@ -107,7 +108,8 @@
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 	nombre = uid_to_purple_name(uid);
 	purple_request_action
-	    (gc, NULL, _("Do you want to add this buddy?"), "", 2,
+	    (gc, NULL, _("Do you want to add this buddy?"), "",
+		PURPLE_DEFAULT_ACTION_NONE,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 g, 2,
 	     _("Cancel"), NULL,
@@ -166,7 +168,8 @@
 		message = g_strdup_printf(_("You have been added by %s"), from);
 		_qq_sys_msg_log_write(gc, message, from);
 		purple_request_action(gc, NULL, message,
-				    _("Would you like to add him?"), 2,
+				    _("Would you like to add him?"),
+					PURPLE_DEFAULT_ACTION_NONE,
 					purple_connection_get_account(gc), name, NULL,
 					g, 3,
 				    _("Cancel"), NULL,
@@ -240,7 +243,7 @@
 	_qq_sys_msg_log_write(gc, message, from);
 
 	purple_request_action
-	    (gc, NULL, message, reason, 2,
+	    (gc, NULL, message, reason, PURPLE_DEFAULT_ACTION_NONE,
 		purple_connection_get_account(gc), name, NULL,
 		 g, 3,
 	     _("Reject"),
@@ -260,7 +263,7 @@
 		g2->uid = strtol(from, NULL, 10);
 		message = g_strdup_printf(_("%s is not in your buddy list"), from);
 		purple_request_action(gc, NULL, message,
-				    _("Would you like to add him?"), 2,
+				    _("Would you like to add him?"), PURPLE_DEFAULT_ACTION_NONE,
 					purple_connection_get_account(gc), name, NULL,
 					g2, 3,
 					_("Cancel"), NULL,