diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-21 11:13:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-28 23:35:55 +0800 |
| commit | 31b57ed0383b2ea225195d4b72a872f7f2d93163 (patch) | |
| tree | 2d70adcce04ed1ed5111c06cd7ad93266419b0e0 /mail/mail-vfolder.c | |
| parent | a91eeb647138ee035444cdc3c265fa4e95898f29 (diff) | |
| download | gsoc2013-evolution-31b57ed0383b2ea225195d4b72a872f7f2d93163.tar.gz gsoc2013-evolution-31b57ed0383b2ea225195d4b72a872f7f2d93163.tar.zst gsoc2013-evolution-31b57ed0383b2ea225195d4b72a872f7f2d93163.zip | |
Adapt to Camel API changes.
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 221151c5ea..cb47af8efb 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -263,8 +263,7 @@ vfolder_adduri_exec (struct _adduri_msg *m) while (l && !vfolder_shutdown) { if (m->remove) camel_vee_folder_remove_folder ( - CAMEL_VEE_FOLDER (l->data), - folder, m->base.cancellable); + CAMEL_VEE_FOLDER (l->data), folder); else camel_vee_folder_add_folder ((CamelVeeFolder *)l->data, folder); l = l->next; @@ -834,7 +833,7 @@ rule_changed (EFilterRule *rule, CamelFolder *folder) oldname = g_strdup (full_name); /* FIXME Not passing a GCancellable or GError. */ - camel_store_rename_folder ( + camel_store_rename_folder_sync ( vfolder_store, oldname, rule->name, NULL, NULL); g_free (oldname); } @@ -869,7 +868,7 @@ context_rule_added (ERuleContext *ctx, /* this always runs quickly */ /* FIXME Not passing a GCancellable or GError. */ - folder = camel_store_get_folder ( + folder = camel_store_get_folder_sync ( vfolder_store, rule->name, 0, NULL, NULL); if (folder) { g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder); @@ -900,7 +899,8 @@ context_rule_removed (ERuleContext *ctx, G_UNLOCK (vfolder); /* FIXME Not passing a GCancellable or GError. */ - camel_store_delete_folder (vfolder_store, rule->name, NULL, NULL); + camel_store_delete_folder_sync ( + vfolder_store, rule->name, NULL, NULL); /* this must be unref'd after its deleted */ if (folder) g_object_unref ((CamelFolder *) folder); |