[gnome-keyring] daemon: Set button labels in prompts

[Stefan Walter <stefw src gnome org>]

commit bf28759cad9a2c38a90c522d95b09461239e81ea
Author: Stef Walter <stefw gnome org>
Date:   Fri Feb 10 14:32:32 2012 +0100

    daemon: Set button labels in prompts
    
     * Use "Unlock" for unlock prompts
    
    Related to: https://bugzilla.gnome.org/show_bug.cgi?id=652459

 daemon/dbus/gkd-secret-change.c      |    3 +++
 daemon/gpg-agent/gkd-gpg-agent-ops.c |    1 +
 pkcs11/wrap-layer/gkm-wrap-prompt.c  |   12 ++++++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-change.c b/daemon/dbus/gkd-secret-change.c
index 10a0725..c2a9263 100644
--- a/daemon/dbus/gkd-secret-change.c
+++ b/daemon/dbus/gkd-secret-change.c
@@ -97,6 +97,7 @@ setup_original_prompt (GkdSecretChange *self,
 	g_free (text);
 
 	gcr_prompt_set_password_new (prompt, FALSE);
+	gcr_prompt_set_continue_label (prompt, _("Continue"));
 }
 
 static void
@@ -132,6 +133,7 @@ setup_password_prompt (GkdSecretChange *self,
 	g_free (text);
 
 	gcr_prompt_set_password_new (prompt, TRUE);
+	gcr_prompt_set_continue_label (prompt, _("Continue"));
 }
 
 static void
@@ -141,6 +143,7 @@ setup_confirmation_prompt (GkdSecretChange *self)
 	gcr_prompt_set_description (GCR_PROMPT (self),
 	                            _("By choosing to use a blank password, your stored passwords will not be safely encrypted. "
 	                              "They will be accessible by anyone with access to your files."));
+	gcr_prompt_set_continue_label (GCR_PROMPT (self), _("Continue"));
 }
 
 static void
diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
index 453ac89..a0e8731 100644
--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
@@ -362,6 +362,7 @@ open_password_prompt (GckSession *session,
 	gcr_prompt_set_description (prompt, description);
 
 	gcr_prompt_set_password_new (prompt, confirm);
+	gcr_prompt_set_continue_label (prompt, _("Unlock"));
 
 	if (errmsg)
 		gcr_prompt_set_warning (prompt, errmsg);
diff --git a/pkcs11/wrap-layer/gkm-wrap-prompt.c b/pkcs11/wrap-layer/gkm-wrap-prompt.c
index a10cc29..185a92d 100644
--- a/pkcs11/wrap-layer/gkm-wrap-prompt.c
+++ b/pkcs11/wrap-layer/gkm-wrap-prompt.c
@@ -599,6 +599,7 @@ setup_unlock_keyring_login (GkmWrapPrompt *self)
 	gcr_prompt_set_description (prompt, text);
 
 	gcr_prompt_set_choice_label (prompt, NULL);
+	gcr_prompt_set_continue_label (prompt, _("Unlock"));
 }
 
 static void
@@ -626,6 +627,7 @@ setup_unlock_keyring_other (GkmWrapPrompt *self,
 	if (gkm_wrap_login_is_usable ())
 		choice = _("Automatically unlock this keyring whenever I'm logged in");
 	gcr_prompt_set_choice_label (prompt, choice);
+	gcr_prompt_set_continue_label (prompt, _("Unlock"));
 }
 
 
@@ -716,6 +718,7 @@ setup_unlock_object (GkmWrapPrompt *self,
 	if (gkm_wrap_login_is_usable ())
 		choice = calc_unlock_object_choice (klass);
 	gcr_prompt_set_choice_label (prompt, choice);
+	gcr_prompt_set_continue_label (prompt, _("Unlock"));
 }
 
 static void
@@ -760,6 +763,8 @@ setup_unlock_prompt (GkmWrapPrompt *self,
 
 	if (!first)
 		gcr_prompt_set_warning (prompt, _("The unlock password was incorrect"));
+
+	gcr_prompt_set_continue_label (prompt, _("Unlock"));
 }
 
 static void
@@ -791,6 +796,8 @@ setup_unlock_token (GkmWrapPrompt *self,
 		choice = _("Automatically unlock whenever I'm logged in");
 	gcr_prompt_set_choice_label (prompt, choice);
 
+	gcr_prompt_set_continue_label (prompt, _("Unlock"));
+
 	g_free (label);
 }
 
@@ -1133,6 +1140,8 @@ setup_init_token (GkmWrapPrompt *self,
 		choice = _("Automatically unlock whenever I'm logged in");
 	gcr_prompt_set_choice_label (prompt, choice);
 
+	gcr_prompt_set_continue_label (prompt, _("Continue"));
+
 	g_free (label);
 }
 
@@ -1243,6 +1252,7 @@ setup_set_token_original (GkmWrapPrompt *self,
 	gcr_prompt_set_description (prompt, text);
 	g_free (text);
 
+	gcr_prompt_set_continue_label (prompt, _("Continue"));
 	gcr_prompt_set_choice_label (prompt, NULL);
 	g_free (label);
 }
@@ -1276,6 +1286,8 @@ setup_set_token_password (GkmWrapPrompt *self,
 	choice = NULL;
 	if (gkm_wrap_login_is_usable ())
 		choice = _("Automatically unlock whenever I'm logged in");
+
+	gcr_prompt_set_continue_label (prompt, _("Continue"));
 	gcr_prompt_set_choice_label (prompt, choice);
 
 	g_free (label);