Adapt to extra arg in camel_session_get_service_by_url().

6 files changed, 11 insertions, 9 deletions

diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index fcdd6b87ac..4f13ff4ab9 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -850,7 +850,7 @@ e_mail_session_unsubscribe_folder_sync (EMailSession *session,
 		goto exit;
 
 	service = camel_session_get_service_by_url (
-		CAMEL_SESSION (session), url);
+		CAMEL_SESSION (session), url, CAMEL_PROVIDER_STORE);
 
 	if (!CAMEL_IS_STORE (service))
 		goto exit;
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 83e191ff65..8f76506dc8 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -1269,7 +1269,7 @@ e_mail_session_uri_to_folder_sync (EMailSession *session,
 	}
 
 	service = camel_session_get_service_by_url (
-		CAMEL_SESSION (session), url);
+		CAMEL_SESSION (session), url, CAMEL_PROVIDER_STORE);
 
 	if (CAMEL_IS_STORE (service)) {
 		const gchar *name = "";
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 2a980cc975..11ae4644cd 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2728,7 +2728,8 @@ em_folder_tree_set_selected_list (EMFolderTree *folder_tree,
 			CamelService *service;
 
 			service = camel_session_get_service_by_url (
-				CAMEL_SESSION (session), url);
+				CAMEL_SESSION (session),
+				url, CAMEL_PROVIDER_STORE);
 			if (CAMEL_IS_STORE (service))
 				u->service = g_object_ref (service);
 		}
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 9ea2521fb3..46b91edefb 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -315,7 +315,7 @@ emfu_copy_folder_selected (EMailBackend *backend,
 	url = camel_url_new (cfd->fi->uri, &local_error);
 	if (url != NULL) {
 		service = camel_session_get_service_by_url (
-			CAMEL_SESSION (session), url);
+			CAMEL_SESSION (session), url, CAMEL_PROVIDER_STORE);
 		camel_url_free (url);
 	}
 
@@ -346,7 +346,7 @@ emfu_copy_folder_selected (EMailBackend *backend,
 	url = camel_url_new (uri, &local_error);
 	if (url != NULL) {
 		service = camel_session_get_service_by_url (
-			CAMEL_SESSION (session), url);
+			CAMEL_SESSION (session), url, CAMEL_PROVIDER_STORE);
 		camel_url_free (url);
 	}
 
@@ -720,7 +720,7 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs,
 	url = camel_url_new (uri, NULL);
 	if (url != NULL) {
 		service = camel_session_get_service_by_url (
-			CAMEL_SESSION (session), url);
+			CAMEL_SESSION (session), url, CAMEL_PROVIDER_STORE);
 		camel_url_free (url);
 	}
 
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 3899dab95b..d43d6fa0fa 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -96,7 +96,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 		url = camel_url_new (uri, NULL);
 		if (url != NULL) {
 			service = camel_session_get_service_by_url (
-				session, url);
+				session, url, CAMEL_PROVIDER_STORE);
 			camel_url_free (url);
 		}
 
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 19d46bad0b..dcf470d06a 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -267,7 +267,7 @@ users_dialog_response (GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 	url = camel_url_new (uri, NULL);
 	if (url != NULL) {
 		service = camel_session_get_service_by_url (
-			CAMEL_SESSION (session), url);
+			session, url, CAMEL_PROVIDER_STORE);
 		camel_url_free (url);
 	}
 
@@ -319,7 +319,8 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 
 	url = camel_url_new (uri, NULL);
 	if (url != NULL) {
-		service = camel_session_get_service_by_url (session, url);
+		service = camel_session_get_service_by_url (
+			session, url, CAMEL_PROVIDER_STORE);
 		camel_url_free (url);
 	}