Adapt to Camel API changes.

8 files changed, 19 insertions, 22 deletions

diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c
index deddd4ac70..2882d46b2c 100644
--- a/libemail-engine/e-mail-folder-utils.c
+++ b/libemail-engine/e-mail-folder-utils.c
@@ -54,7 +54,7 @@ async_context_free (AsyncContext *context)
 		g_object_unref (context->message);
 
 	if (context->info != NULL)
-		camel_message_info_free (context->info);
+		camel_message_info_unref (context->info);
 
 	if (context->part != NULL)
 		g_object_unref (context->part);
@@ -249,7 +249,7 @@ mail_folder_expunge_pop3_stores (CamelFolder *folder,
 
 		if (info != NULL) {
 			flags = camel_message_info_flags (info);
-			camel_folder_free_message_info (folder, info);
+			camel_message_info_unref (info);
 		}
 
 		/* Only interested in deleted messages. */
@@ -797,7 +797,7 @@ e_mail_folder_find_duplicate_messages_sync (CamelFolder *folder,
 		/* Skip messages marked for deletion. */
 		if (flags & CAMEL_MESSAGE_DELETED) {
 			g_queue_push_tail (&trash, key);
-			camel_message_info_free (info);
+			camel_message_info_unref (info);
 			continue;
 		}
 
@@ -805,7 +805,7 @@ e_mail_folder_find_duplicate_messages_sync (CamelFolder *folder,
 
 		if (digest == NULL) {
 			g_queue_push_tail (&trash, key);
-			camel_message_info_free (info);
+			camel_message_info_unref (info);
 			continue;
 		}
 
@@ -827,7 +827,7 @@ e_mail_folder_find_duplicate_messages_sync (CamelFolder *folder,
 			g_queue_push_tail (&trash, key);
 		}
 
-		camel_message_info_free (info);
+		camel_message_info_unref (info);
 	}
 
 	/* Delete all non-duplicate messages from the hash table. */
@@ -1171,8 +1171,7 @@ e_mail_folder_remove_sync (CamelFolder *folder,
 			g_warning (
 				"%s: Failed to find folder '%s'",
 				G_STRFUNC, full_name);
-			camel_store_free_folder_info (
-				parent_store, folder_info);
+			camel_folder_info_free (folder_info);
 			return TRUE;
 		}
 
@@ -1206,7 +1205,7 @@ e_mail_folder_remove_sync (CamelFolder *folder,
 	 * state so we don't leak folder_info nodes. */
 	to_remove->next = next;
 
-	camel_store_free_folder_info (parent_store, folder_info);
+	camel_folder_info_free (folder_info);
 
 	return success;
 }
@@ -1360,8 +1359,8 @@ mail_folder_strip_message (CamelFolder *folder,
 				CAMEL_MESSAGE_DELETED,
 				CAMEL_MESSAGE_DELETED);
 
-		camel_folder_free_message_info (folder, orig_info);
-		camel_message_info_free (copy_info);
+		camel_message_info_unref (orig_info);
+		camel_message_info_unref (copy_info);
 	}
 
 	return success;
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 6402e26a65..da39b54ff3 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -74,7 +74,7 @@ async_context_free (AsyncContext *context)
 		g_object_unref (context->message);
 
 	if (context->info != NULL)
-		camel_message_info_free (context->info);
+		camel_message_info_unref (context->info);
 
 	if (context->from != NULL)
 		g_object_unref (context->from);
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 58d217d9c2..0dfa7ed2dc 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -1781,7 +1781,7 @@ mail_session_forward_to_sync (CamelSession *session,
 		g_mutex_unlock (&priv->preparing_flush_lock);
 	}
 
-	camel_message_info_free (info);
+	camel_message_info_unref (info);
 
 	g_object_unref (source);
 
diff --git a/libemail-engine/e-mail-store-utils.c b/libemail-engine/e-mail-store-utils.c
index cb33af154e..9a9828e02e 100644
--- a/libemail-engine/e-mail-store-utils.c
+++ b/libemail-engine/e-mail-store-utils.c
@@ -78,7 +78,7 @@ e_mail_store_create_folder_sync (CamelStore *store,
 			CAMEL_SUBSCRIBABLE (store),
 			full_name, cancellable, error);
 
-	camel_store_free_folder_info (store, folder_info);
+	camel_folder_info_free (folder_info);
 
 	return success;
 }
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 4afa0cec53..9fc29ce984 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -313,7 +313,7 @@ guess_mail_account_from_folder (ESourceRegistry *registry,
 			location = camel_vee_folder_get_location (CAMEL_VEE_FOLDER (folder), (CamelVeeMessageInfo *) mi, NULL);
 			if (location)
 				store = camel_folder_get_parent_store (location);
-			camel_folder_free_message_info (folder, mi);
+			camel_message_info_unref (mi);
 		}
 	}
 
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index edffb9a593..c7c95df00e 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -440,9 +440,7 @@ static void
 async_context_free (AsyncContext *async_context)
 {
 	if (async_context->info != NULL)
-		camel_store_free_folder_info (
-			async_context->store_info->store,
-			async_context->info);
+		camel_folder_info_free (async_context->info);
 
 	store_info_unref (async_context->store_info);
 
@@ -944,7 +942,8 @@ folder_changed_cb (CamelFolder *folder,
 						subject = NULL;
 					}
 				}
-				camel_folder_free_message_info (folder, info);
+
+				camel_message_info_unref (info);
 			}
 		}
 	}
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 4f3dbd3ee1..ad6e1c1328 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -854,7 +854,7 @@ exit:
 	}
 
 	if (info != NULL)
-		camel_message_info_free (info);
+		camel_message_info_unref (info);
 
 	if (service != NULL)
 		g_object_unref (service);
@@ -914,7 +914,7 @@ send_queue_exec (struct _send_queue_msg *m,
 		if (info) {
 			if ((camel_message_info_flags (info) & CAMEL_MESSAGE_DELETED) == 0)
 				send_uids->pdata[j++] = uids->pdata[i];
-			camel_folder_free_message_info (m->queue, info);
+			camel_message_info_unref (info);
 		}
 	}
 
diff --git a/libemail-engine/mail-vfolder.c b/libemail-engine/mail-vfolder.c
index afd7a03cad..2c7290da75 100644
--- a/libemail-engine/mail-vfolder.c
+++ b/libemail-engine/mail-vfolder.c
@@ -128,8 +128,7 @@ vfolder_get_include_subfolders_uris (EMailSession *session,
 		}
 	}
 
-	if (fi)
-		camel_store_free_folder_info (store, fi);
+	camel_folder_info_free (fi);
 
 	g_object_unref (store);
 	g_free (folder_name);