# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1200557437 0
# Node ID 70fc60344317d5940e92e82ff2b2c532a2b066f9
# Parent  1f3f2d2c9a2b56616a4745e37803c3d450c2bc73
A few more of those "default_action" fixes

diff -r 1f3f2d2c9a2b -r 70fc60344317 finch/gntcertmgr.c
--- a/finch/gntcertmgr.c	Thu Jan 17 08:02:38 2008 +0000
+++ b/finch/gntcertmgr.c	Thu Jan 17 08:10:37 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 1f3f2d2c9a2b -r 70fc60344317 libpurple/certificate.c
--- a/libpurple/certificate.c	Thu Jan 17 08:02:38 2008 +0000
+++ b/libpurple/certificate.c	Thu Jan 17 08:10:37 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 */
diff -r 1f3f2d2c9a2b -r 70fc60344317 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Thu Jan 17 08:02:38 2008 +0000
+++ b/libpurple/protocols/jabber/auth.c	Thu Jan 17 08:10:37 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 1f3f2d2c9a2b -r 70fc60344317 pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c	Thu Jan 17 08:02:38 2008 +0000
+++ b/pidgin/gtkcertmgr.c	Thu Jan 17 08:10:37 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 1f3f2d2c9a2b -r 70fc60344317 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Thu Jan 17 08:02:38 2008 +0000
+++ b/pidgin/gtkutils.c	Thu Jan 17 08:10:37 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