Adapt to CamelSession API changes.

These functions now return new references:

  camel_session_add_service()
  camel_session_list_services()

These functions have been renamed and also return new references:

  camel_session_get_service()        -> camel_session_ref_service()
  camel_session_get_service_by_url() -> camel_session_ref_service_by_url()

3 files changed, 20 insertions, 11 deletions

diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 8b00ccf0a2..7472a50f35 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -314,7 +314,7 @@ mail_shell_backend_mail_sync (EMailShellBackend *mail_shell_backend)
 			mail_shell_backend);
 	}
 
-	g_list_free (list);
+	g_list_free_full (list, (GDestroyNotify) g_object_unref);
 
 exit:
 	return TRUE;
@@ -481,8 +481,8 @@ mail_shell_backend_changes_committed_cb (EMailConfigWindow *window,
 	original_source = e_mail_config_window_get_original_source (window);
 
 	uid = e_source_get_uid (original_source);
-	service = camel_session_get_service (CAMEL_SESSION (session), uid);
-	g_return_if_fail (CAMEL_IS_STORE (service));
+	service = camel_session_ref_service (CAMEL_SESSION (session), uid);
+	g_return_if_fail (service != NULL);
 
 	shell_backend = E_SHELL_BACKEND (mail_shell_backend);
 
@@ -511,6 +511,8 @@ mail_shell_backend_changes_committed_cb (EMailConfigWindow *window,
 		mail_shell_backend_disconnect_done_cb, activity);
 
 	g_object_unref (cancellable);
+
+	g_object_unref (service);
 }
 
 static void
@@ -589,11 +591,16 @@ mail_shell_backend_constructed (GObject *object)
 		500);
 
 	mail_session = e_mail_backend_get_session (E_MAIL_BACKEND (object));
-	vstore = camel_session_get_service (CAMEL_SESSION (mail_session), E_MAIL_SESSION_VFOLDER_UID);
+	vstore = camel_session_ref_service (
+		CAMEL_SESSION (mail_session), E_MAIL_SESSION_VFOLDER_UID);
+	g_return_if_fail (vstore != NULL);
+
 	g_object_bind_property (
 		shell_settings, "mail-enable-unmatched-search-folder",
 		vstore, "unmatched-enabled",
 		G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+
+	g_object_unref (vstore);
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index f51286bc2f..48f9d74471 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -244,7 +244,7 @@ action_mail_download_cb (GtkAction *action,
 			action_mail_download_finished_cb, activity);
 	}
 
-	g_list_free (list);
+	g_list_free_full (list, (GDestroyNotify) g_object_unref);
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 1db444e936..ebbbcef65f 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -605,15 +605,16 @@ all_accounts:
 	/* Create a new search folder. */
 
 	/* FIXME Complete lack of error checking here. */
-	service = camel_session_get_service (
+	service = camel_session_ref_service (
 		CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID);
 	camel_service_connect_sync (service, NULL, NULL);
 
 	search_folder = (CamelVeeFolder *) camel_vee_folder_new (
-		CAMEL_STORE (service), _("All Account Search"),
-		0);
+		CAMEL_STORE (service), _("All Account Search"), 0);
 	priv->search_account_all = search_folder;
 
+	g_object_unref (service);
+
 	camel_vee_folder_set_expression (search_folder, query);
 
  all_accounts_setup:
@@ -701,15 +702,16 @@ current_account:
 	/* Create a new search folder. */
 
 	/* FIXME Complete lack of error checking here. */
-	service = camel_session_get_service (
+	service = camel_session_ref_service (
 		CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID);
 	camel_service_connect_sync (service, NULL, NULL);
 
 	search_folder = (CamelVeeFolder *) camel_vee_folder_new (
-		CAMEL_STORE (service), _("Account Search"),
-		0);
+		CAMEL_STORE (service), _("Account Search"), 0);
 	priv->search_account_current = search_folder;
 
+	g_object_unref (service);
+
 	camel_vee_folder_set_expression (search_folder, query);
 
  current_accout_setup: