diff options
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index eb447ea888..6ed6a61d90 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -88,7 +88,9 @@ vfolder_setup_desc (struct _setup_msg *m) } static void -vfolder_setup_exec (struct _setup_msg *m) +vfolder_setup_exec (struct _setup_msg *m, + GCancellable *cancellable, + GError **error) { GList *l, *list = NULL; CamelFolder *folder; @@ -243,7 +245,9 @@ vfolder_adduri_desc (struct _adduri_msg *m) } static void -vfolder_adduri_exec (struct _adduri_msg *m) +vfolder_adduri_exec (struct _adduri_msg *m, + GCancellable *cancellable, + GError **error) { GList *l; CamelFolder *folder = NULL; @@ -252,8 +256,6 @@ vfolder_adduri_exec (struct _adduri_msg *m) if (vfolder_shutdown) return; - d(printf("%s uri to vfolder: %s\n", m->remove?"Removing":"Adding", m->uri)); - folder_cache = e_mail_session_get_folder_cache (m->session); /* we dont try lookup the cache if we are removing it, its no longer there */ @@ -266,8 +268,7 @@ vfolder_adduri_exec (struct _adduri_msg *m) if (folder == NULL) folder = e_mail_session_uri_to_folder_sync ( - m->session, m->uri, 0, - m->base.cancellable, &m->base.error); + m->session, m->uri, 0, cancellable, error); if (folder != NULL) { l = m->folders; |