aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-subscribe-editor.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-07-08 23:04:23 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-09-28 23:35:55 +0800
commita91eeb647138ee035444cdc3c265fa4e95898f29 (patch)
tree63b5712bc407630d6ad6e504244e6cc4ebc35a86 /mail/em-subscribe-editor.c
parent2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff)
downloadgsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar
gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.gz
gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.bz2
gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.lz
gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.xz
gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.zst
gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.zip
Pass GCancellable to Camel.
Diffstat (limited to 'mail/em-subscribe-editor.c')
-rw-r--r--mail/em-subscribe-editor.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 39ec661013..c0d1120a3e 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -268,11 +268,11 @@ sub_folder_exec (struct _zsubscribe_msg *m)
if (m->subscribe)
camel_store_subscribe_folder (
m->sub->store, m->node->info->full_name,
- &m->base.error);
+ m->base.cancellable, &m->base.error);
else
camel_store_unsubscribe_folder (
m->sub->store, m->node->info->full_name,
- &m->base.error);
+ m->base.cancellable, &m->base.error);
}
static void
@@ -453,15 +453,13 @@ static void
sub_folderinfo_exec (struct _emse_folderinfo_msg *m)
{
if (m->seq == m->sub->seq) {
- camel_operation_register (m->base.cancel);
/* get the full folder tree for search ability */
m->info = camel_store_get_folder_info (
m->sub->store, NULL,
CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL |
CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST |
CAMEL_STORE_FOLDER_INFO_RECURSIVE,
- &m->base.error);
- camel_operation_unregister ();
+ m->base.cancellable, &m->base.error);
}
}