im.pidgin.pidgin: a00c23cb7c851de1701db02d50c4f35bdf540595

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: a00c23cb7c851de1701db02d50c4f35bdf540595
Ancestor: 8c2343ff351cfc20512d916b4308bd6a3a4883db
Author: markdoliner at pidgin.im
Date: 2008-01-17T08:10:37
Branch: im.pidgin.pidgin

Modified files:
        finch/gntcertmgr.c libpurple/certificate.c
        libpurple/protocols/jabber/auth.c pidgin/gtkcertmgr.c
        pidgin/gtkutils.c

ChangeLog: 

A few more of those "default_action" fixes

-------------- next part --------------
============================================================
--- finch/gntcertmgr.c	c09ee934a5fd21605ed386846b33cabcd3a6c597
+++ finch/gntcertmgr.c	37512dbdbe1c1ff726b5d716854d2b661ebcbfc9
@@ -235,7 +235,7 @@ delete_cert_cb(GntWidget *button, gpoint
 	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,
============================================================
--- libpurple/certificate.c	8b52d035638ea7f080968085b7a467a54cd87712
+++ libpurple/certificate.c	c2b239f32efe93a3196275bde9a0a364e560b487
@@ -568,7 +568,7 @@ x509_singleuse_start_verify (PurpleCerti
 		_("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 */
============================================================
--- libpurple/protocols/jabber/auth.c	4afae6a57c5b5faea532c149891ab5d29ed915e2
+++ libpurple/protocols/jabber/auth.c	11fce39ec326ef9f133c0762d0348641505f8942
@@ -325,7 +325,7 @@ static void jabber_auth_start_cyrus(Jabb
 					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 @@ jabber_auth_start(JabberStream *js, xmln
 			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 @@ static void auth_old_cb(JabberStream *js
 				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);
============================================================
--- pidgin/gtkcertmgr.c	d91c6067dd08b48bf45503f1afc91874d5a9ea9b
+++ pidgin/gtkcertmgr.c	58e5f43f26e0f2b0ab44fd3f6e5440eabccc4669
@@ -373,7 +373,7 @@ tls_peers_mgmt_delete_cb(GtkWidget *butt
 		
 		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,
============================================================
--- pidgin/gtkutils.c	09a67199b5153c9a75c361dfa48eb1641d298786
+++ pidgin/gtkutils.c	f97856e347a3079e0e816589d6bd3e1827caeb82
@@ -1595,7 +1595,7 @@ pidgin_dnd_file_manage(GtkSelectionData 
 			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