Adapt to CamelSession and e-passwords changes.

5 files changed, 11 insertions, 11 deletions

diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index d169dda8f8..72985f4021 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -891,7 +891,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
 		return;
 
 	if (!retrying && !password)
-		password = e_passwords_get_password ("Calendar", g_object_get_data (dialog, "caldav-auth-key"));
+		password = e_passwords_get_password (NULL, g_object_get_data (dialog, "caldav-auth-key"));
 
 	if (!password || !*password || retrying) {
 		gchar *pass, *prompt, *add = NULL;
@@ -918,7 +918,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
 		}
 
 		pass = e_passwords_ask_password (_("Enter password"),
-			"Calendar", g_object_get_data (dialog, "caldav-auth-key"), prompt,
+			NULL, g_object_get_data (dialog, "caldav-auth-key"), prompt,
 			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_DISABLE_REMEMBER | E_PASSWORDS_SECRET,
 			NULL, GTK_WINDOW (dialog));
 
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 1e54362c0d..5643c4f0ba 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -441,7 +441,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 
 	user = decode_at_back (username);
 	tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), user);
-	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp,
+	password = e_passwords_ask_password (_("Enter password"), NULL, "", tmp,
 			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER,
 			NULL, parent);
 	g_free (tmp);
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 3ea3747108..8fad76f79f 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -322,14 +322,14 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us
 
 	euri = e_uri_new (ms->uri->location);
 	username = euri->user;
-	password = e_passwords_get_password ("Calendar", ms->uri->location);
+	password = e_passwords_get_password (NULL, ms->uri->location);
 	req_pass = ((username && *username) && !(ms->uri->service_type == TYPE_ANON_FTP &&
 			!strcmp (username, "anonymous"))) ? TRUE:FALSE;
 
 	if (!password && req_pass) {
 		gboolean remember = FALSE;
 
-		password = e_passwords_ask_password (_("Enter password"), "", ms->uri->location, message,
+		password = e_passwords_ask_password (_("Enter password"), NULL, ms->uri->location, message,
 					     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
 					     &remember,
 					     NULL);
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index af539ddd05..9089561ccf 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -88,11 +88,11 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
 		uri->publish_frequency = atoi ((gchar *) frequency);
 	uri->publish_format = URI_PUBLISH_AS_FB;
 
-	password = e_passwords_get_password ("Calendar", (gchar *)location);
+	password = e_passwords_get_password (NULL, (gchar *)location);
 	if (password) {
-		e_passwords_forget_password ("Calendar", (gchar *)location);
+		e_passwords_forget_password (NULL, (gchar *)location);
 		e_passwords_add_password (uri->location, password);
-		e_passwords_remember_password ("Calendar", uri->location);
+		e_passwords_remember_password (NULL, uri->location);
 	}
 
 	for (p = root->children; p != NULL; p = p->next) {
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 26d0a981f9..c2e68b9069 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -437,7 +437,7 @@ url_editor_dialog_construct (UrlEditorDialog *dialog)
 		gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->publish_frequency), uri->publish_frequency);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->type_selector), uri->publish_format);
 
-		uri->password = e_passwords_get_password ("Calendar", uri->location);
+		uri->password = e_passwords_get_password (NULL, uri->location);
 		if (uri->password) {
 			if (strlen (uri->password) != 0) {
 				gtk_entry_set_text (GTK_ENTRY (dialog->password_entry), uri->password);
@@ -572,9 +572,9 @@ url_editor_dialog_run (UrlEditorDialog *dialog)
 
 		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->remember_pw))) {
 			e_passwords_add_password (dialog->uri->location, dialog->uri->password);
-			e_passwords_remember_password ("Calendar", dialog->uri->location);
+			e_passwords_remember_password (NULL, dialog->uri->location);
 		} else {
-			e_passwords_forget_password ("Calendar", dialog->uri->location);
+			e_passwords_forget_password (NULL, dialog->uri->location);
 		}
 
 		l = e_source_selector_get_selection (E_SOURCE_SELECTOR (dialog->events_selector));