Adapt to Camel API changes.

11 files changed, 32 insertions, 38 deletions

diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 052d08a0dc..af75e069f6 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -291,7 +291,7 @@ mail_browser_message_selected_cb (EMailBrowser *browser,
 		camel_message_info_set_flags (
 			info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
 
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	g_clear_object (&folder);
@@ -863,7 +863,7 @@ mail_browser_set_message (EMailReader *reader,
 		gtk_window_set_title (
 			GTK_WINDOW (reader),
 			camel_message_info_subject (info));
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	g_clear_object (&folder);
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 5c1ef76806..0a8f237805 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -143,7 +143,7 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 			g_ptr_array_add (views, g_strdup (uid));
 		}
 
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	n_views = views->len;
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index a5c877643f..512af51d62 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -871,7 +871,7 @@ e_mail_reader_open_selected (EMailReader *reader)
 			g_ptr_array_add (views, g_strdup (uid));
 		}
 
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	for (ii = 0; ii < views->len; ii++) {
@@ -2033,7 +2033,7 @@ e_mail_reader_save_messages (EMailReader *reader)
 		subject = camel_message_info_subject (info);
 		if (subject != NULL)
 			suggestion = g_strconcat (subject, ".mbox", NULL);
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	if (suggestion == NULL) {
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 0ebf5f175e..761fa5842e 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -202,7 +202,7 @@ action_mail_add_sender_cb (GtkAction *action,
 
 exit:
 	if (info != NULL)
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	g_ptr_array_unref (uids);
 
 	g_clear_object (&folder);
@@ -4073,7 +4073,7 @@ e_mail_reader_check_state (EMailReader *reader)
 		string = camel_message_info_mlist (info);
 		is_mailing_list &= (string != NULL && *string != '\0');
 
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	have_enabled_account =
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 0926363ad2..630fe0f77a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -799,7 +799,7 @@ composer_save_to_drafts_append_mail (AsyncContext *async_context,
 		composer_save_to_drafts_cleanup,
 		async_context);
 
-	camel_message_info_free (info);
+	camel_message_info_unref (info);
 
 	g_object_unref (drafts_folder);
 }
@@ -998,7 +998,7 @@ em_utils_composer_save_to_outbox_cb (EMsgComposer *composer,
 		composer_save_to_outbox_completed,
 		async_context);
 
-	camel_message_info_free (info);
+	camel_message_info_unref (info);
 }
 
 static void
@@ -1582,12 +1582,12 @@ em_utils_get_real_folder_uri_and_message_uid (CamelFolder *folder,
 				*folder_uri = e_mail_folder_uri_from_folder (real_folder);
 				*message_uid = real_uid;
 
-				camel_folder_free_message_info (folder, mi);
+				camel_message_info_unref (mi);
 
 				return;
 			}
 
-			camel_folder_free_message_info (folder, mi);
+			camel_message_info_unref (mi);
 		}
 	}
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index bb8dc0475b..16bb94d0e6 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -393,8 +393,7 @@ folder_tree_get_folder_info_cb (CamelStore *store,
 		COL_BOOL_LOAD_SUBDIRS, FALSE, -1);
 
 exit:
-	if (folder_info != NULL)
-		camel_store_free_folder_info (store, folder_info);
+	camel_folder_info_free (folder_info);
 
 	async_context_free (context);
 }
@@ -655,7 +654,7 @@ folder_tree_cell_edited_cb (EMFolderTree *folder_tree,
 		e_alert_run_dialog_for_args (
 			parent, "mail:no-rename-folder-exists",
 			old_name, new_name, NULL);
-		camel_store_free_folder_info (store, folder_info);
+		camel_folder_info_free (folder_info);
 		goto exit;
 	}
 
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 52e70c96ba..f96f7d18cd 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -274,9 +274,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m,
 		l = l->next;
 	}
 
- exception:
-
-	camel_store_free_folder_info (m->fromstore, fi);
+exception:
+	camel_folder_info_free (fi);
 	g_list_free (deleting);
 
 	g_string_free (toname, TRUE);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 749d3d12fe..03a6ce56a1 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -338,7 +338,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 			camel_message_info_from (info),
 			camel_message_info_subject (info));
 
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	/* special-case... */
@@ -354,7 +354,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 			if (tags)
 				e_mail_tag_editor_set_tag_list (
 					E_MAIL_TAG_EDITOR (editor), tags);
-			camel_folder_free_message_info (folder, info);
+			camel_message_info_unref (info);
 		}
 	}
 
@@ -379,7 +379,7 @@ em_utils_flag_for_followup (EMailReader *reader,
 			camel_message_info_set_user_tag (
 				info, iter->name, iter->value);
 
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 	}
 
 	camel_folder_thaw (folder);
@@ -420,7 +420,7 @@ em_utils_flag_for_followup_clear (GtkWindow *parent,
 			camel_message_info_set_user_tag (mi, "follow-up", NULL);
 			camel_message_info_set_user_tag (mi, "due-by", NULL);
 			camel_message_info_set_user_tag (mi, "completed-on", NULL);
-			camel_folder_free_message_info (folder, mi);
+			camel_message_info_unref (mi);
 		}
 	}
 
@@ -460,7 +460,7 @@ em_utils_flag_for_followup_completed (GtkWindow *parent,
 			tag = camel_message_info_user_tag (mi, "follow-up");
 			if (tag && tag[0])
 				camel_message_info_set_user_tag (mi, "completed-on", now);
-			camel_folder_free_message_info (folder, mi);
+			camel_message_info_unref (mi);
 		}
 	}
 
@@ -769,7 +769,7 @@ em_utils_selection_set_uidlist (GtkSelectionData *selection_data,
 				g_free (folder_uri);
 			}
 
-			camel_folder_free_message_info (folder, info);
+			camel_message_info_unref (info);
 		}
 	} else {
 		folder_uri = e_mail_folder_uri_from_folder (folder);
@@ -925,7 +925,7 @@ em_utils_build_export_basename (CamelFolder *folder,
 	basename = g_strdup_printf ("%s_%s%s", datetmp, subject, extension);
 
 	if (info != NULL)
-		camel_folder_free_message_info (folder, info);
+		camel_message_info_unref (info);
 
 	return basename;
 }
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 19df23d03c..a54cd08a82 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -191,7 +191,7 @@ import_mbox_exec (struct _import_mbox_msg *m,
 			camel_folder_append_message_sync (
 				folder, msg, info, NULL,
 				cancellable, error);
-			camel_message_info_free (info);
+			camel_message_info_unref (info);
 			g_object_unref (msg);
 
 			if (error && *error != NULL)
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index cd8b7b457e..072641bf3c 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1110,7 +1110,7 @@ refresh_folders_free (struct _refresh_folders_msg *m)
 		g_free (m->folders->pdata[i]);
 	g_ptr_array_free (m->folders, TRUE);
 
-	camel_store_free_folder_info (m->store, m->finfo);
+	camel_folder_info_free (m->finfo);
 	g_object_unref (m->store);
 }
 
diff --git a/mail/message-list.c b/mail/message-list.c
index 1b0ba490a6..fb4eaf835b 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -515,8 +515,7 @@ regen_data_unref (RegenData *regen_data)
 			length = regen_data->summary->len;
 
 			for (ii = 0; ii < length; ii++)
-				camel_folder_free_message_info (
-					regen_data->folder,
+				camel_message_info_unref (
 					regen_data->summary->pdata[ii]);
 
 			g_ptr_array_free (regen_data->summary, TRUE);
@@ -3477,10 +3476,7 @@ clear_info (gchar *key,
             GNode *node,
             MessageList *message_list)
 {
-	CamelMessageInfo *info;
-
-	info = node->data;
-	camel_folder_free_message_info (message_list->priv->folder, info);
+	camel_message_info_unref (node->data);
 	node->data = NULL;
 }
 
@@ -3745,7 +3741,7 @@ ml_uid_nodemap_insert (MessageList *message_list,
 	flags = camel_message_info_flags (info);
 	date = camel_message_info_date_received (info);
 
-	camel_folder_ref_message_info (folder, info);
+	camel_message_info_ref (info);
 	g_hash_table_insert (message_list->uid_nodemap, (gpointer) uid, node);
 
 	/* Track the latest seen and unseen messages shown, used in
@@ -3793,7 +3789,7 @@ ml_uid_nodemap_remove (MessageList *message_list,
 	}
 
 	g_hash_table_remove (message_list->uid_nodemap, uid);
-	camel_folder_free_message_info (folder, info);
+	camel_message_info_unref (info);
 
 	g_object_unref (folder);
 }
@@ -4257,7 +4253,7 @@ mail_folder_hide_by_flag (CamelFolder *folder,
 			camel_folder_change_info_change_uid (
 				newchanges, changes->uid_changed->pdata[i]);
 		if (info)
-			camel_folder_free_message_info (folder, info);
+			camel_message_info_unref (info);
 	}
 
 	if (newchanges->uid_added->len > 0 || newchanges->uid_removed->len > 0) {
@@ -5156,7 +5152,7 @@ free_message_info_data (gpointer uid,
 		g_ptr_array_free (data->values, TRUE);
 	}
 
-	camel_folder_free_message_info (sort_data->folder, data->mi);
+	camel_message_info_unref (data->mi);
 	g_free (data);
 }
 
@@ -5257,7 +5253,7 @@ ml_sort_uids_by_tree (MessageList *message_list,
 			cmp_array_uids,
 			&sort_data);
 
-	camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
+	camel_folder_summary_unlock (folder->summary);
 
 	/* FIXME Teach the hash table to destroy its own data. */
 	g_hash_table_foreach (
@@ -5332,7 +5328,7 @@ message_list_regen_tweak_search_results (MessageList *message_list,
 			search_results,
 			(gpointer) camel_pstring_strdup (uid));
 
-	camel_folder_free_message_info (folder, info);
+	camel_message_info_unref (info);
 }
 
 static void