[evolution-groupwise] Adapt to CamelSession and e-passwords changes.

[Matthew Barnes <mbarnes src gnome org>]

commit 0210f6d0d437849accc7704deb9bd86b07a79d85
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 4 10:03:25 2011 -0400

    Adapt to CamelSession and e-passwords changes.

 src/camel/camel-groupwise-store.c |    2 +-
 src/plugins/camel-gw-listener.c   |    6 +++---
 src/plugins/proxy-login.c         |    6 +++---
 src/plugins/proxy.c               |    4 ++--
 src/plugins/send-options.c        |    4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/camel/camel-groupwise-store.c b/src/camel/camel-groupwise-store.c
index 5352a88..543d2c3 100644
--- a/src/camel/camel-groupwise-store.c
+++ b/src/camel/camel-groupwise-store.c
@@ -130,7 +130,7 @@ groupwise_auth_loop (CamelService *service,
 				"GroupWise", url->user, url->host);
 			url->passwd =
 				camel_session_get_password (
-					session, service, "Groupwise", prompt,
+					session, service, prompt,
 					"password", prompt_flags, error);
 			g_free (prompt);
 
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index 803adfa..5a02f26 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -503,18 +503,18 @@ get_addressbook_names_from_server (gchar *source_url)
 		count++;
 		/*we have to uncache the password before prompting again*/
 		if (failed_auth) {
-			e_passwords_forget_password ("Groupwise", key);
+			e_passwords_forget_password (NULL, key);
 			password = NULL;
 		}
 
-		password = e_passwords_get_password ("Groupwise", key);
+		password = e_passwords_get_password (NULL, key);
 		if (!password) {
 			/* Translators: First %s is the server name, second %s is user name */
 			password_prompt = g_strdup_printf (_("Enter password for %s (user %s)"),
 					poa_address, url->user);
 			prompt = g_strconcat (failed_auth ? failed_auth : "", password_prompt, NULL);
 			g_free (password_prompt);
-			password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
+			password = e_passwords_ask_password (prompt, NULL, key, prompt,
 					flags, &remember,
 					NULL);
 			g_free (prompt);
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index 2f6bd12..d890f52 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -208,7 +208,7 @@ proxy_get_password (EAccount *account, gchar **user_name, gchar **password)
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
-	*password = e_passwords_get_password ("Groupwise", key);
+	*password = e_passwords_get_password (NULL, key);
 
 	g_free (key);
 	g_free (prompt);
@@ -251,10 +251,10 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, url->host, url->user);
 
-	password = e_passwords_get_password ("Groupwise", key);
+	password = e_passwords_get_password (NULL, key);
 
 	if (!password)
-		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
+		password = e_passwords_ask_password (prompt, NULL, key, prompt,
 				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, password_dlg_parrent);
 
 	g_free (prompt);
diff --git a/src/plugins/proxy.c b/src/plugins/proxy.c
index 9a88ff7..a21da4a 100644
--- a/src/plugins/proxy.c
+++ b/src/plugins/proxy.c
@@ -493,9 +493,9 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
-	password = e_passwords_get_password ("Groupwise", key);
+	password = e_passwords_get_password (NULL, key);
 	if (!password)
-		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
+		password = e_passwords_ask_password (prompt, NULL, key, prompt,
 				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, parent_window);
 	g_free (prompt);
 
diff --git a/src/plugins/send-options.c b/src/plugins/send-options.c
index b3323ff..7ed37c2 100644
--- a/src/plugins/send-options.c
+++ b/src/plugins/send-options.c
@@ -84,9 +84,9 @@ get_cnc (GtkWindow *parent_window)
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
-	password = e_passwords_get_password ("Groupwise", key);
+	password = e_passwords_get_password (NULL, key);
 	if (!password)
-		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
+		password = e_passwords_ask_password (prompt, NULL, key, prompt,
 				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, parent_window);
 	g_free (prompt);