diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-15 11:16:38 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-15 11:48:02 +0800 |
| commit | 5310e4a0b10ded4c77ce9dfaff49d3e99e327462 (patch) | |
| tree | b29d85e7bb2e7b3e772859fa7e0e2ff9ab33846e /mail/importers/mail-importer.c | |
| parent | 47d25995c5ca78ff530ce6a23faebf6547898e8e (diff) | |
| download | gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.gz gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.bz2 gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.lz gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.xz gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.tar.zst gsoc2013-evolution-5310e4a0b10ded4c77ce9dfaff49d3e99e327462.zip | |
Adapt to CamelOperation API changes.
Diffstat (limited to 'mail/importers/mail-importer.c')
| -rw-r--r-- | mail/importers/mail-importer.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index d00725533a..ddc9f66300 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -215,7 +215,7 @@ static void import_mbox_free (struct _import_mbox_msg *m) { if (m->cancel) - camel_operation_unref (m->cancel); + g_object_unref (m->cancel); g_free (m->uri); g_free (m->path); } @@ -239,10 +239,8 @@ mail_importer_import_mbox (const gchar *path, const gchar *folderuri, CamelOpera m->uri = g_strdup (folderuri); m->done = done; m->done_data = data; - if (cancel) { - m->cancel = cancel; - camel_operation_ref (cancel); - } + if (cancel) + m->cancel = g_object_ref (cancel); id = m->base.seq; mail_msg_fast_ordered_push (m); @@ -258,10 +256,8 @@ mail_importer_import_mbox_sync (const gchar *path, const gchar *folderuri, Camel m = mail_msg_new (&import_mbox_info); m->path = g_strdup (path); m->uri = g_strdup (folderuri); - if (cancel) { - m->cancel = cancel; - camel_operation_ref (cancel); - } + if (cancel) + m->cancel = g_object_ref (cancel); import_mbox_exec (m); import_mbox_done (m); |