Blame SOURCES/evolution-3.8.5-smime-card-token-prompt.patch
|
 |
79117e |
diff -up evolution-3.8.5/smime/gui/component.c.smime-card-token-prompt evolution-3.8.5/smime/gui/component.c
|
|
|
79117e |
--- evolution-3.8.5/smime/gui/component.c.smime-card-token-prompt 2013-07-23 14:52:24.000000000 +0200
|
|
|
79117e |
+++ evolution-3.8.5/smime/gui/component.c 2014-02-20 08:33:27.612276892 +0100
|
|
|
79117e |
@@ -45,11 +45,20 @@ smime_pk11_passwd (ECertDB *db,
|
|
|
79117e |
{
|
|
|
79117e |
gchar *prompt;
|
|
|
79117e |
gchar *slot_name = g_strdup (PK11_GetSlotName (slot));
|
|
|
79117e |
+ gchar *token_name = g_strdup (PK11_GetTokenName (slot));
|
|
|
79117e |
|
|
|
79117e |
g_strchomp (slot_name);
|
|
|
79117e |
|
|
|
79117e |
- prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name);
|
|
|
79117e |
+ if (token_name)
|
|
|
79117e |
+ g_strchomp (token_name);
|
|
|
79117e |
+
|
|
|
79117e |
+ if (token_name && *token_name && g_ascii_strcasecmp (slot_name, token_name) != 0)
|
|
|
79117e |
+ prompt = g_strdup_printf (_("Enter the password for '%s', token '%s'"), slot_name, token_name);
|
|
|
79117e |
+ else
|
|
|
79117e |
+ prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name);
|
|
|
79117e |
+
|
|
|
79117e |
g_free (slot_name);
|
|
|
79117e |
+ g_free (token_name);
|
|
|
79117e |
|
|
|
79117e |
*passwd = e_passwords_ask_password (
|
|
|
79117e |
_("Enter password"), "", prompt,
|