[evolution] Adapt to Camel API changes.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Adapt to Camel API changes.
- Date: Mon, 23 Sep 2013 16:05:24 +0000 (UTC)
commit 82010c57ec4bcd2b10346a2ced038f2e0eb38b85
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Sep 22 07:24:18 2013 -0400
Adapt to Camel API changes.
libemail-engine/e-mail-folder-utils.c | 19 +++++++++----------
libemail-engine/e-mail-session-utils.c | 2 +-
libemail-engine/e-mail-session.c | 2 +-
libemail-engine/e-mail-store-utils.c | 2 +-
libemail-engine/e-mail-utils.c | 2 +-
libemail-engine/mail-folder-cache.c | 7 +++----
libemail-engine/mail-ops.c | 4 ++--
libemail-engine/mail-vfolder.c | 3 +--
mail/e-mail-browser.c | 4 ++--
mail/e-mail-folder-pane.c | 2 +-
mail/e-mail-reader-utils.c | 4 ++--
mail/e-mail-reader.c | 4 ++--
mail/em-composer-utils.c | 8 ++++----
mail/em-folder-tree.c | 5 ++---
mail/em-folder-utils.c | 5 ++---
mail/em-utils.c | 14 +++++++-------
mail/importers/mail-importer.c | 2 +-
mail/mail-send-recv.c | 2 +-
mail/message-list.c | 20 ++++++++------------
modules/mail/e-mail-shell-view-actions.c | 13 ++++++-------
modules/mail/e-mail-shell-view.c | 3 +--
modules/mdn/evolution-mdn.c | 11 +++++------
plugins/dbx-import/dbx-importer.c | 2 +-
plugins/pst-import/pst-importer.c | 2 +-
plugins/templates/templates.c | 2 +-
25 files changed, 66 insertions(+), 78 deletions(-)
---
diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c
index deddd4a..2882d46 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 6402e26..da39b54 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 58d217d..0dfa7ed 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 cb33af1..9a9828e 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 4afa0ce..9fc29ce 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 edffb9a..c7c95df 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 4f3dbd3..ad6e1c1 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 afd7a03..2c7290d 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);
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 052d08a..af75e06 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 5c1ef76..0a8f237 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 a5c8776..512af51 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 0ebf5f1..761fa58 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 0926363..630fe0f 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 bb8dc04..16bb94d 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 52e70c9..f96f7d1 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 749d3d1..03a6ce5 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 19df23d..a54cd08 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 cd8b7b4..072641b 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 1b0ba49..fb4eaf8 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
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index a0191ef..ef69f05 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 b2bfbf1..ed6f685 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 a3d14b7..2254064 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);
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index c2fe26d..53060b7 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -688,7 +688,7 @@ dbx_import_file (DbxImporter *m)
success = camel_folder_append_message_sync (
folder, msg, info, NULL,
cancellable, &m->base.error);
- camel_message_info_free (info);
+ camel_message_info_unref (info);
g_object_unref (msg);
if (!success) {
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index f5d4d5a..0e4d1f6 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -1404,7 +1404,7 @@ pst_process_email (PstImporter *m,
/* FIXME Not passing a GCancellable or GError here. */
success = camel_folder_append_message_sync (
m->folder, msg, info, NULL, NULL, NULL);
- camel_message_info_free (info);
+ camel_message_info_unref (info);
g_object_unref (msg);
/* FIXME Not passing a GCancellable or GError here. */
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 95d0060..75e0303 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -1303,7 +1303,7 @@ build_menu (EShellWindow *shell_window,
&action_count, merge_id, folder_info,
shell_view);
- camel_store_free_folder_info (local_store, folder_info);
+ camel_folder_info_free (folder_info);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
