im.pidgin.pidgin: 2de31939762c087dff10d169f0efa028dc3ca05d

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 2de31939762c087dff10d169f0efa028dc3ca05d
Ancestor: c5f0afa4059239bf55d344857ab508ceaad52000
Author: markdoliner at pidgin.im
Date: 2008-01-17T07:36:55
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/msn.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/sys_msg.c

ChangeLog: 

Minor improvements to the default_action used in purple_action_request

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c	63c9236c0b11be3322eac4e901162ba433c1b5e9
+++ libpurple/protocols/msn/msn.c	79a0bf93432869bfc566e34e87b9ada3f0b4a80a
@@ -351,7 +351,7 @@ msn_show_set_mobile_pages(PurplePluginAc
 						_("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),
============================================================
--- libpurple/protocols/novell/novell.c	067060bf286afbbef12b408d7aba79f54c80072c
+++ libpurple/protocols/novell/novell.c	be1a5a1a8c2aa8c6ab17efbeed0bfd3cf6f61025
@@ -1920,6 +1920,7 @@ _evt_conference_invite(NMUser * user, NM
 	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,
============================================================
--- libpurple/protocols/qq/group_im.c	1e7b36bc831e78c0a964559ec4735286078cb567
+++ libpurple/protocols/qq/group_im.c	cdb413a9efd8140bfdb485edac0754bc405350a6
@@ -135,7 +135,7 @@ void qq_process_recv_group_im_apply_join
 
 	purple_request_action(gc, _("QQ Qun Operation"),
 			    msg, reason,
-			    2,
+			    PURPLE_DEFAULT_ACTION_NONE,
 				purple_connection_get_account(gc), nombre, NULL,
 				g, 3,
 			    _("Approve"),
============================================================
--- libpurple/protocols/qq/group_opt.c	0ba1e8d92dde92c2644b4e47e4c4e39a9d8564f4
+++ libpurple/protocols/qq/group_opt.c	2c14e9f95ef3fa0f15345764a1fb3697fa825f10
@@ -96,7 +96,8 @@ void qq_group_search_application_with_st
 	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),
============================================================
--- libpurple/protocols/qq/sys_msg.c	b2dd4eea3d5a596704f9ea8d43e78853e5d18a73
+++ libpurple/protocols/qq/sys_msg.c	ddb215c4828f1b0438eed0b3701cce631a3549b7
@@ -84,7 +84,8 @@ static void _qq_search_before_auth_with_
 
 	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 @@ static void _qq_search_before_add_with_g
 	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 @@ static void _qq_process_msg_sys_being_ad
 		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 @@ static void _qq_process_msg_sys_add_cont
 	_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 @@ static void _qq_process_msg_sys_add_cont
 		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,