diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-29 21:32:50 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-29 21:33:36 +0800 |
commit | e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b (patch) | |
tree | 86234111f2facee6e45c4247b33d0f9050ad706c /mail/importers/elm-importer.c | |
parent | 6ec1118c92dcdf1f8377efde3ea575b5bc94412a (diff) | |
download | gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.gz gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.bz2 gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.lz gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.xz gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.tar.zst gsoc2013-evolution-e41b4083a60c2a8c4879ea3a7fc2e1d29a01720b.zip |
camel_operation_new() now returns a GCancellable pointer.
Diffstat (limited to 'mail/importers/elm-importer.c')
-rw-r--r-- | mail/importers/elm-importer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index e6afc2bbac..0164378942 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -55,7 +55,7 @@ struct _elm_import_msg { gchar *status_what; gint status_pc; gint status_timeout_id; - CamelOperation *status; + GCancellable *status; }; static GHashTable * @@ -196,7 +196,8 @@ elm_import_exec (struct _elm_import_msg *m) else elmdir = g_strdup (maildir); - mail_importer_import_folders_sync (elmdir, elm_special_folders, 0, m->status); + mail_importer_import_folders_sync ( + elmdir, elm_special_folders, 0, m->status); g_free (elmdir); } @@ -346,7 +347,7 @@ elm_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) struct _elm_import_msg *m = g_datalist_get_data(&target->data, "elm-msg"); if (m) - camel_operation_cancel (m->status); + g_cancellable_cancel (m->status); } static EImportImporter elm_importer = { |