diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-09-22 19:24:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-09-24 00:03:17 +0800 |
| commit | 82010c57ec4bcd2b10346a2ced038f2e0eb38b85 (patch) | |
| tree | 690caa8da37fbb3c9d317b65706062a889ff8983 /modules/mail | |
| parent | bfc448800cea06fb2b7c4fa26cda4e01ffd7a354 (diff) | |
| download | gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.tar gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.tar.gz gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.tar.bz2 gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.tar.lz gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.tar.xz gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.tar.zst gsoc2013-evolution-82010c57ec4bcd2b10346a2ced038f2e0eb38b85.zip | |
Adapt to Camel API changes.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 13 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 3 |
2 files changed, 7 insertions, 9 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 { |