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

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Aug 17 15:17:43 2008
New Revision: 1247
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1247&view=rev

Log:
	* daemon/ui/gkr-ask-request.h:
	* daemon/ui/gkr-ask-tool.c: Use better text for button in 
	keyring create password prompt. Patch by Adam Schreiber.
	Fixes bug #547722


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

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 17 15:17:43 2008
@@ -43,6 +43,7 @@
 	
 	GKR_ASK_REQUEST_OK_BUTTON               = 0x0100,
 	GKR_ASK_REQUEST_CANCEL_BUTTON           = 0x0200,
+	GKR_ASK_REQUEST_CREATE_BUTTON           = 0x0400,
 	GKR_ASK_REQUEST_ALLOW_BUTTON            = 0x1000,
 	GKR_ASK_REQUEST_ALLOW_FOREVER_BUTTON    = 0x2000,
 	GKR_ASK_REQUEST_DENY_BUTTON             = 0x4000,
@@ -61,8 +62,10 @@
 	(GKR_ASK_REQUEST_OK_BUTTON | GKR_ASK_REQUEST_DENY_BUTTON)
 #define GKR_ASK_REQUEST_OK_CANCEL_BUTTONS \
 	(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_NEW_PASSWORD  \
-	(GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_CONFIRM_PASSWORD | GKR_ASK_REQUEST_OK_DENY_BUTTONS) 
+	(GKR_ASK_REQUEST_PASSWORD | GKR_ASK_REQUEST_CONFIRM_PASSWORD | GKR_ASK_REQUEST_CREATE_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 17 15:17:43 2008
@@ -621,6 +621,10 @@
 		buttons[i] = GTK_STOCK_OK;
 		resps[i++] = GKR_ASK_RESPONSE_ALLOW;
 	}
+	if (flags & GKR_ASK_REQUEST_CREATE_BUTTON) {
+	    buttons[i] = _("_Create");
+	    resps[i++] = GKR_ASK_RESPONSE_ALLOW;
+    }
 	if (flags & GKR_ASK_REQUEST_ALLOW_BUTTON) {
 		buttons[i] = _("Allow _Once");
 		resps[i++] = GKR_ASK_RESPONSE_ALLOW;