im.pidgin.pidgin: 83991ae88feb9e1b67de8050056deac49a4586ec

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 83991ae88feb9e1b67de8050056deac49a4586ec
Ancestor: 50da2976a7c558ef77a9e53ebd765a362c82bec0
Author: markdoliner at pidgin.im
Date: 2008-02-03T11:39:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/83991ae88feb9e1b67de8050056deac49a4586ec

Modified files:
        finch/gntaccount.c finch/gntcertmgr.c pidgin/gtkaccount.c
        pidgin/gtkcertmgr.c

ChangeLog: 

The Gnome Human Interface Guidelines say, "if pressing this button by
mistake could cause a loss of data, do not set a default button for the
window. Do not make Cancel the default button instead."

So I changed our account deletion dialog to not have a default action.
For things like deleting a buddy or a certificate I think it makes
sense to have the default be "yes" because it's much less severe
than deleting an account (which deletes your buddies, contacts, etc).

-------------- next part --------------
============================================================
--- finch/gntaccount.c	b3a3e93a028b0a918e11a6a1f9008e29d32d3197
+++ finch/gntaccount.c	a4357d714dd198a01019ee07c80d34ccf4632a4e
@@ -632,7 +632,8 @@ delete_account_cb(GntWidget *widget, Gnt
 	prompt = g_strdup_printf(_("Are you sure you want to delete %s?"),
 			purple_account_get_username(account));
 
-	purple_request_action(account, _("Delete Account"), prompt, NULL, 0,
+	purple_request_action(account, _("Delete Account"), prompt, NULL,
+						  PURPLE_DEFAULT_ACTION_NONE,
 						  account, NULL, NULL, account, 2,
 						  _("Delete"), really_delete_account,
 						  _("Cancel"), NULL);
============================================================
--- finch/gntcertmgr.c	85e1a7e690999d17defc2d143d277e2c9f7730fa
+++ finch/gntcertmgr.c	ab5068d98b50f3ef1b3f0493f0c31af32268513e
@@ -234,7 +234,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,
-			1,
+			0,
 			NULL, NULL, NULL,
 			g_strdup(key),
 			tls_peers_mgmt_delete_confirm_cb,
============================================================
--- pidgin/gtkaccount.c	5fab8a6c2d073295e6a065d565fbf96c581631d7
+++ pidgin/gtkaccount.c	30a8beef9fac237de36fec930c9c2620b4f86569
@@ -1833,7 +1833,8 @@ ask_delete_account_sel(GtkTreeModel *mod
 							  purple_account_get_username(account));
 
 		purple_request_close_with_handle(account);
-		purple_request_action(account, NULL, buf, NULL, 0,
+		purple_request_action(account, NULL, buf, NULL,
+							PURPLE_DEFAULT_ACTION_NONE,
 							account, NULL, NULL,
 							account, 2,
 							_("Delete"), delete_account_cb,
============================================================
--- pidgin/gtkcertmgr.c	b97ac0da3284c9d47555f4670295b8f1de3d4ecb
+++ pidgin/gtkcertmgr.c	c061fa9493ea3cd74b977496a62d5c49e59d4d0f
@@ -372,7 +372,7 @@ tls_peers_mgmt_delete_cb(GtkWidget *butt
 
 		purple_request_yes_no(tpm_dat, _("Confirm certificate delete"),
 				      primary, NULL, /* Can this be NULL? */
-				      1, /* NO is default action */
+				      0, /* "yes" is the default action */
 				      NULL, NULL, NULL,
 				      id, /* id ownership passed to callback */
 				      tls_peers_mgmt_delete_confirm_cb,