[evolution/account-mgmt: 6/33] Adapt libessmime to the new e-passwords API.

[Matthew Barnes <mbarnes src gnome org>]

commit 005fa15f7d8a4f1b64a8dc202fdd254eaccc5bca
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Dec 7 15:44:49 2010 -0600

    Adapt libessmime to the new e-passwords API.

 smime/gui/component.c |   16 ++++++++--------
 smime/lib/e-pkcs12.c  |    7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 0b7a679..6b83023 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -46,10 +46,10 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, gchar **pass
 	prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name);
 	g_free (slot_name);
 
-	*passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", "",
-					    prompt,
-					    E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
-					    NULL);
+	*passwd = e_passwords_ask_password (
+		NULL, _("Enter password"), prompt,
+		E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET,
+		NULL, NULL);
 
 	g_free (prompt);
 
@@ -68,10 +68,10 @@ smime_pk11_change_passwd (ECertDB *db, gchar **old_passwd, gchar **passwd, gpoin
 		/* we're setting the password initially */
 		prompt = _("Enter new password for certificate database");
 
-		*passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", "",
-						    prompt,
-						    E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
-						    NULL);
+		*passwd = e_passwords_ask_password (
+			NULL, _("Enter new password"), prompt,
+			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET,
+			NULL, NULL);
 	}
 	else {
 		/* we're changing the password */
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 6b7b7ae..966e511 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -202,9 +202,10 @@ prompt_for_password (gchar *title, gchar *prompt, SECItem *pwd)
 {
 	gchar *passwd;
 
-	passwd = e_passwords_ask_password (title, "SMIME-PKCS12", "", prompt,
-					   E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
-					   NULL);
+	passwd = e_passwords_ask_password (
+		NULL, title, prompt,
+		E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET,
+		NULL, NULL);
 
 	if (passwd) {
 		gsize len = strlen (passwd);