diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-08 23:04:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-28 23:35:55 +0800 |
| commit | a91eeb647138ee035444cdc3c265fa4e95898f29 (patch) | |
| tree | 63b5712bc407630d6ad6e504244e6cc4ebc35a86 /mail/importers | |
| parent | 2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff) | |
| download | gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.gz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.zst gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.zip | |
Pass GCancellable to Camel.
Diffstat (limited to 'mail/importers')
| -rw-r--r-- | mail/importers/mail-importer.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index ddc9f66300..3dac78744c 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -123,7 +123,8 @@ import_mbox_exec (struct _import_mbox_msg *m) folder = e_mail_local_get_folder (E_MAIL_FOLDER_INBOX); else folder = mail_tool_uri_to_folder ( - m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.error); + m->uri, CAMEL_STORE_FOLDER_CREATE, + m->base.cancellable, &m->base.error); if (folder == NULL) return; @@ -181,7 +182,8 @@ import_mbox_exec (struct _import_mbox_msg *m) camel_message_info_set_flags (info, flags, ~0); camel_folder_append_message ( - folder, msg, info, NULL, &m->base.error); + folder, msg, info, NULL, + m->base.cancellable, &m->base.error); camel_message_info_free (info); g_object_unref (msg); @@ -190,7 +192,8 @@ import_mbox_exec (struct _import_mbox_msg *m) camel_mime_parser_step (mp, NULL, NULL); } - camel_folder_sync (folder, FALSE, NULL); + /* FIXME Not passing a GCancellable or GError here. */ + camel_folder_sync (folder, FALSE, NULL, NULL); camel_folder_thaw (folder); camel_operation_end (NULL); /* TODO: these api's are a bit weird, registering the old is the same as deregistering */ @@ -200,7 +203,8 @@ import_mbox_exec (struct _import_mbox_msg *m) g_object_unref (mp); } fail1: - camel_folder_sync (folder, FALSE, NULL); + /* FIXME Not passing a GCancellable or GError here. */ + camel_folder_sync (folder, FALSE, NULL, NULL); g_object_unref (folder); } |