Adapt to Camel API changes.

3 files changed, 12 insertions, 15 deletions

diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index a0191effa3..ef69f05a1c 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -116,11 +116,9 @@ account_refresh_folder_info_received_cb (GObject *source,
 
 	info = camel_store_get_folder_info_finish (store, result, &error);
 
-	if (info != NULL) {
-		/* Provider takes care of notifications of new/removed
-		 * folders, thus it's enough to free the returned list. */
-		camel_store_free_folder_info (store, info);
-	}
+	/* Provider takes care of notifications of new/removed
+	 * folders, thus it's enough to free the returned list. */
+	camel_folder_info_free (info);
 
 	if (e_activity_handle_cancellation (activity, error)) {
 		g_error_free (error);
@@ -599,9 +597,10 @@ mark_all_read_got_folder_info (GObject *source,
 			g_strdup (folder_info->full_name));
 
 	if (response == MARK_ALL_READ_WITH_SUBFOLDERS)
-		mark_all_read_collect_folder_names (&context->folder_names, folder_info);
+		mark_all_read_collect_folder_names (
+			&context->folder_names, folder_info);
 
-	camel_store_free_folder_info (store, folder_info);
+	camel_folder_info_free (folder_info);
 
 	if (g_queue_is_empty (&context->folder_names)) {
 		e_activity_set_state (context->activity, E_ACTIVITY_COMPLETED);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index b2bfbf1973..ed6f685164 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -99,8 +99,7 @@ add_folders_from_store (GList **folders,
 		fi = next;
 	}
 
-	if (root)
-		camel_store_free_folder_info_full (store, root);
+	camel_folder_info_free (root);
 }
 
 typedef struct {
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index a3d14b7258..225406438b 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -82,8 +82,7 @@ static void
 mdn_context_free (MdnContext *context)
 {
 	if (context->info != NULL)
-		camel_folder_free_message_info (
-			context->folder, context->info);
+		camel_message_info_unref (context->info);
 
 	g_object_unref (context->source);
 	g_object_unref (context->reader);
@@ -423,7 +422,7 @@ mdn_notify_sender (ESource *identity_source,
 		NULL, (GAsyncReadyCallback) mdn_receipt_done,
 		g_object_ref (session));
 
-	camel_message_info_free (receipt_info);
+	camel_message_info_unref (receipt_info);
 }
 
 static void
@@ -441,7 +440,7 @@ mdn_notify_action_cb (GtkAction *action,
 		MDN_SENDING_MODE_MANUAL);
 
 	/* Make sure the newly-added user flag gets saved. */
-	camel_folder_free_message_info (context->folder, context->info);
+	camel_message_info_unref (context->info);
 	context->info = NULL;
 }
 
@@ -568,7 +567,7 @@ mdn_message_loaded_cb (EMailReader *reader,
 
 exit:
 	if (info != NULL)
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 
 	g_clear_object (&folder);
 	g_free (notify_to);
@@ -628,7 +627,7 @@ mdn_message_seen_cb (EMailReader *reader,
 
 exit:
 	if (info != NULL)
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 
 	g_clear_object (&folder);
 	g_free (notify_to);