callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-08-31 mcrha Fix for bug #378759

Browse Source 
svn path=/trunk/; revision=34144
This commit is contained in:
Milan Crha
2007-08-31 06:09:09 +00:00
parent e7d6ad6d83
commit cc1f27817b
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
smime/ChangeLog
View File

@ -1,3 +1,11 @@
2007-08-31 Milan Crha <mcrha@redhat.com>
** Fix for bug #378759
* gui/component.c: (smime_pk11_passwd), (smime_pk11_change_passwd):
* lib/e-pkcs12.c: (prompt_for_password):
Do not pass NULL as 'key' parameter.
2007-07-30 Andre Klapper <a9016009@gmx.de>
* gui/smime-ui.glade:

4
smime/gui/component.c
View File

@ -47,7 +47,7 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passw
prompt = g_strdup_printf (_("Enter the password for `%s'"), slot_name);
g_free (slot_name);
*passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", NULL,
*passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", "",
prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);
@ -69,7 +69,7 @@ smime_pk11_change_passwd (ECertDB *db, char **old_passwd, char **passwd, gpointe
/* we're setting the password initially */
prompt = _("Enter new password for certificate database");
*passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", NULL,
*passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", "",
prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);

2
smime/lib/e-pkcs12.c
View File

@ -219,7 +219,7 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd)
{
char *passwd;
passwd = e_passwords_ask_password (title, "SMIME-PKCS12", NULL, prompt,
passwd = e_passwords_ask_password (title, "SMIME-PKCS12", "", prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);