# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1200558409 0
# Node ID 6edcab92fb1dfd7fcd41802262d5e3456aefaa51
# Parent  c85ee90ed86102a4142b304fcc881138ec14124b# Parent  04bdf1ff5d2ac309a6dfec2011d786c2788fc431
merge of '74dec26c42145486ebbc521d7df8e3f33c5b168a'
     and '9b62a8ab099ed7310841c47abe9d6ba113ad4d8e'

diff -r 04bdf1ff5d2a -r 6edcab92fb1d finch/gntcertmgr.c
--- a/finch/gntcertmgr.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/finch/gntcertmgr.c	Thu Jan 17 08:26:49 2008 +0000
@@ -235,7 +235,7 @@
 	purple_request_close_with_handle((void *)key);
 	purple_request_yes_no((void *)key, _("Confirm certificate delete"),
 			primary, NULL,
-			2,
+			1,
 			NULL, NULL, NULL,
 			g_strdup(key),
 			tls_peers_mgmt_delete_confirm_cb,
diff -r 04bdf1ff5d2a -r 6edcab92fb1d libpurple/certificate.c
--- a/libpurple/certificate.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/libpurple/certificate.c	Thu Jan 17 08:26:49 2008 +0000
@@ -568,7 +568,7 @@
 		_("Single-use Certificate Verification"),
 		primary,
 		secondary,
-		1,            /* Accept by default */
+		0,            /* Accept by default */
 		NULL,         /* No account */
 		NULL,         /* No other user */
 		NULL,         /* No associated conversation */
@@ -1199,7 +1199,7 @@
 		_("SSL Certificate Verification"),
 		primary,
 		reason,
-		2,            /* Accept by default */
+		0,            /* Accept by default */
 		NULL,         /* No account */
 		NULL,         /* No other user */
 		NULL,         /* No associated conversation */
diff -r 04bdf1ff5d2a -r 6edcab92fb1d libpurple/plugins/offlinemsg.c
--- a/libpurple/plugins/offlinemsg.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/libpurple/plugins/offlinemsg.c	Thu Jan 17 08:26:49 2008 +0000
@@ -159,7 +159,7 @@
 	
 		purple_request_action(handle, _("Offline Message"), ask,
 					_("You can edit/delete the pounce from the `Buddy Pounces' dialog"),
-					1,
+					0,
 					offline->account, offline->who, offline->conv,
 					offline, 2,
 					_("Yes"), record_pounce,
diff -r 04bdf1ff5d2a -r 6edcab92fb1d libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/libpurple/protocols/jabber/auth.c	Thu Jan 17 08:26:49 2008 +0000
@@ -325,7 +325,7 @@
 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),
 							msg,
-							2, js->gc->account, NULL, NULL, js->gc->account,
+							1, js->gc->account, NULL, NULL, js->gc->account,
 							allow_cyrus_plaintext_auth,
 							disallow_plaintext_auth);
 					g_free(msg);
@@ -527,7 +527,7 @@
 			purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 					_("Plaintext Authentication"),
 					msg,
-					2,
+					1,
 					purple_connection_get_account(js->gc), NULL, NULL,
 					purple_connection_get_account(js->gc), allow_plaintext_auth,
 					disallow_plaintext_auth);
@@ -719,7 +719,7 @@
 				purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 						_("Plaintext Authentication"),
 						_("This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
-						2,
+						1,
 						purple_connection_get_account(js->gc), NULL, NULL,
 						purple_connection_get_account(js->gc), allow_plaintext_auth,
 						disallow_plaintext_auth);
diff -r 04bdf1ff5d2a -r 6edcab92fb1d libpurple/protocols/msnp9/msn.c
--- a/libpurple/protocols/msnp9/msn.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/libpurple/protocols/msnp9/msn.c	Thu Jan 17 08:26:49 2008 +0000
@@ -347,7 +347,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 04bdf1ff5d2a -r 6edcab92fb1d pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/pidgin/gtkcertmgr.c	Thu Jan 17 08:26:49 2008 +0000
@@ -373,7 +373,7 @@
 		
 		purple_request_yes_no(tpm_dat, _("Confirm certificate delete"),
 				      primary, NULL, /* Can this be NULL? */
-				      2, /* NO is default action */
+				      1, /* NO is default action */
 				      NULL, NULL, NULL,
 				      id, /* id ownership passed to callback */
 				      tls_peers_mgmt_delete_confirm_cb,
diff -r 04bdf1ff5d2a -r 6edcab92fb1d pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Thu Jan 17 08:12:37 2008 +0000
+++ b/pidgin/gtkutils.c	Thu Jan 17 08:26:49 2008 +0000
@@ -1595,7 +1595,7 @@
 			else if (!(im || ft))
 				purple_request_yes_no(NULL, NULL, _("You have dragged an image"),
 							_("Would you like to set it as the buddy icon for this user?"),
-							0,
+							PURPLE_DEFAULT_ACTION_NONE,
 							account, who, NULL,
 							data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb);
 			else