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 /plugins | |
| 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 'plugins')
| -rw-r--r-- | plugins/dbx-import/dbx-importer.c | 2 | ||||
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 72b4e04c99..c4f1d462c1 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -743,7 +743,7 @@ org_gnome_evolution_readdbx_import (EImport *ei, EImportTarget *target, EImportI m->status_timeout_id = g_timeout_add (100, dbx_status_timeout, m); /*m->status_timeout_id = NULL;*/ m->status_lock = g_mutex_new (); - m->cancellable = (GCancellable *) camel_operation_new (); + m->cancellable = camel_operation_new (); g_signal_connect ( m->cancellable, "status", diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index e320445130..8a42d0d5ef 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -1624,7 +1624,7 @@ pst_import (EImport *ei, EImportTarget *target) m->status_timeout_id = g_timeout_add (100, pst_status_timeout, m); /*m->status_timeout_id = NULL;*/ m->status_lock = g_mutex_new (); - m->status = (GCancellable *) camel_operation_new (); + m->cancellable = camel_operation_new (); g_signal_connect ( m->status, "status", |