aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-05 13:21:10 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-07 09:10:57 +0800
commit41f0d7117eb958bd4a153c27e3cd0a58e14f4d75 (patch)
tree472b21d27779f0c4cfc55869532b35ae85ef7f8c /plugins
parent8382a9cbfb2c58cee99c34a93d027a50a1bf695c (diff)
downloadgsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar
gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.gz
gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.bz2
gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.lz
gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.xz
gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.zst
gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.zip
Adapt to CamelOperation API changes.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/pst-import/pst-importer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 7ef82d450e..d4054b573e 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -798,7 +798,6 @@ static void
pst_import_folders (PstImporter *m,
pst_desc_tree *topitem)
{
- CamelOperation *co = CAMEL_OPERATION (m->cancellable);
GHashTable *node_to_folderuri; /* pointers of hierarchy nodes, to them associated folder uris */
pst_desc_tree *d_ptr;
@@ -809,7 +808,7 @@ pst_import_folders (PstImporter *m,
g_hash_table_insert (node_to_folderuri, topitem, g_strdup (m->folder_uri));
/* Walk through folder tree */
- while (d_ptr != NULL && (camel_operation_cancel_check (co) == FALSE)) {
+ while (d_ptr != NULL && (g_cancellable_is_cancelled (m->cancellable) == FALSE)) {
gchar *previous_folder = NULL;
m->position++;