Index: smime/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/smime/ChangeLog,v
retrieving revision 1.65
diff -u -p -r1.65 ChangeLog
--- smime/ChangeLog	15 Jun 2006 14:28:47 -0000	1.65
+++ smime/ChangeLog	27 Jul 2006 15:24:58 -0000
@@ -1,3 +1,12 @@
+2006-06-27  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+	** Fixes #334848
+	
+	* lib/e-pkcs12.c (prompt_for_password): 
+	* gui/component.c (smime_pk11_passwd), (smime_pk11_change_passwd): 
+	Do not pass NULL for the domain parameter of
+	e_passwords_ask_password.
+	
 2006-06-15  Tor Lillqvist  <tml@novell.com>
 
 	* lib/e-cert-db.c (initialize_nss): On Win32, NSS wants filenames
Index: smime/lib/e-pkcs12.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-pkcs12.c,v
retrieving revision 1.10
diff -u -p -r1.10 e-pkcs12.c
--- smime/lib/e-pkcs12.c	30 Jan 2006 11:50:47 -0000	1.10
+++ smime/lib/e-pkcs12.c	27 Jul 2006 15:24:58 -0000
@@ -219,7 +219,7 @@ prompt_for_password (char *title, char *
 {
 	char *passwd;
 
-	passwd = e_passwords_ask_password (title, NULL, NULL, prompt,
+	passwd = e_passwords_ask_password (title, "SMIME-PKCS12", NULL, prompt,
 					   E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
 					   NULL);
 
Index: smime/gui/component.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/component.c,v
retrieving revision 1.7
diff -u -p -r1.7 component.c
--- smime/gui/component.c	30 Jan 2006 11:50:47 -0000	1.7
+++ smime/gui/component.c	27 Jul 2006 15:24:58 -0000
@@ -47,7 +47,7 @@ smime_pk11_passwd (ECertDB *db, PK11Slot
 	prompt = g_strdup_printf (_("Enter the password for `%s'"), slot_name);
 	g_free (slot_name);
 
-	*passwd = e_passwords_ask_password (_("Enter password"), NULL, NULL,
+	*passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", NULL,
 					    prompt,
 					    E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
 					    NULL);
@@ -69,7 +69,7 @@ smime_pk11_change_passwd (ECertDB *db, c
 		/* we're setting the password initially */
 		prompt = _("Enter new password for certificate database");
 
-		*passwd = e_passwords_ask_password (_("Enter new password"), NULL, NULL,
+		*passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", NULL,
 						    prompt,
 						    E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
 						    NULL);
