gnome-keyring r1282 - in trunk: . daemon daemon/ui

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Aug 31 18:25:39 2008
New Revision: 1282
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1282&view=rev

Log:
	* daemon/gkr-daemon-ops.c:
	* daemon/ui/gkr-ask-request.h:
	* daemon/ui/gkr-ask-tool.c: Use proper text for button when
	prompting to change password. Fixes bug #549730. Patch by
	Adam Schreiber.


Modified:
   trunk/ChangeLog
   trunk/daemon/gkr-daemon-ops.c
   trunk/daemon/ui/gkr-ask-request.h
   trunk/daemon/ui/gkr-ask-tool.c

Modified: trunk/daemon/gkr-daemon-ops.c
==============================================================================
--- trunk/daemon/gkr-daemon-ops.c	(original)
+++ trunk/daemon/gkr-daemon-ops.c	Sun Aug 31 18:25:39 2008
@@ -527,7 +527,7 @@
 		} 
 	}
 	
-	flags = GKR_ASK_REQUEST_NEW_PASSWORD;
+	flags = GKR_ASK_REQUEST_CHANGE_PASSWORD;
 	if (!*original)
 		flags |= GKR_ASK_REQUEST_ORIGINAL_PASSWORD;
 

Modified: trunk/daemon/ui/gkr-ask-request.h
==============================================================================
--- trunk/daemon/ui/gkr-ask-request.h	(original)
+++ trunk/daemon/ui/gkr-ask-request.h	Sun Aug 31 18:25:39 2008
@@ -44,6 +44,7 @@
 	GKR_ASK_REQUEST_OK_BUTTON               = 0x0100,
 	GKR_ASK_REQUEST_CANCEL_BUTTON           = 0x0200,
 	GKR_ASK_REQUEST_CREATE_BUTTON           = 0x0400,
+	GKR_ASK_REQUEST_CHANGE_BUTTON           = 0x0800,
 	GKR_ASK_REQUEST_ALLOW_BUTTON            = 0x1000,
 	GKR_ASK_REQUEST_ALLOW_FOREVER_BUTTON    = 0x2000,
 	GKR_ASK_REQUEST_DENY_BUTTON             = 0x4000,
@@ -64,8 +65,12 @@
 	(GKR_ASK_REQUEST_OK_BUTTON | GKR_ASK_REQUEST_CANCEL_BUTTON)
 #define GKR_ASK_REQUEST_CREATE_CANCEL_BUTTONS \
 	(GKR_ASK_REQUEST_CREATE_BUTTON | GKR_ASK_REQUEST_CANCEL_BUTTON)
+#define GKR_ASK_REQUEST_CHANGE_CANCEL_BUTTONS \
+    (GKR_ASK_REQUEST_CHANGE_BUTTON | GKR_ASK_REQUEST_CANCEL_BUTTON)
 #define GKR_ASK_REQUEST_NEW_PASSWORD  \
-	(GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_CONFIRM_PASSWORD | GKR_ASK_REQUEST_CREATE_CANCEL_BUTTONS) 
+	(GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_CONFIRM_PASSWORD | GKR_ASK_REQUEST_CREATE_CANCEL_BUTTONS)
+#define GKR_ASK_REQUEST_CHANGE_PASSWORD \
+    ( GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_CONFIRM_PASSWORD | GKR_ASK_REQUEST_CHANGE_CANCEL_BUTTONS)
 #define GKR_ASK_REQUEST_PROMPT_PASSWORD \
 	(GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_OK_DENY_BUTTONS)
 #define GKR_ASK_REQUEST_ACCESS_SOMETHING \

Modified: trunk/daemon/ui/gkr-ask-tool.c
==============================================================================
--- trunk/daemon/ui/gkr-ask-tool.c	(original)
+++ trunk/daemon/ui/gkr-ask-tool.c	Sun Aug 31 18:25:39 2008
@@ -622,9 +622,13 @@
 		resps[i++] = GKR_ASK_RESPONSE_ALLOW;
 	}
 	if (flags & GKR_ASK_REQUEST_CREATE_BUTTON) {
-	    buttons[i] = _("_Create");
-	    resps[i++] = GKR_ASK_RESPONSE_ALLOW;
-    }
+		buttons[i] = _("C_reate");
+		resps[i++] = GKR_ASK_RESPONSE_ALLOW;
+	}
+	if (flags & GKR_ASK_REQUEST_CHANGE_BUTTON) {
+		buttons[i] = _("C_hange");
+		resps[i++] = GKR_ASK_RESPONSE_ALLOW;
+	}
 	if (flags & GKR_ASK_REQUEST_ALLOW_BUTTON) {
 		buttons[i] = _("Allow _Once");
 		resps[i++] = GKR_ASK_RESPONSE_ALLOW;