aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-mt.c
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-11-08 19:48:40 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-11-08 19:48:40 +0800
commit1107fea0f8edff76d5956426044c9afe41c387fa (patch)
tree3140debb1cef6c058425360e0c43b6c55da75f3a /mail/mail-mt.c
parentceda5ef420b4a4b97ce0011d49be3f96e857c9ef (diff)
parent88d5608a97ebaee9c04c3e8ac6b79278e824ecee (diff)
downloadgsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar
gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.gz
gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.bz2
gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.lz
gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.xz
gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.zst
gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/mail-mt.c')
-rw-r--r--mail/mail-mt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 0d05a21a86..526571f61f 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -283,7 +283,7 @@ mail_msg_cancel (guint msgid)
g_mutex_unlock (mail_msg_lock);
if (cancellable != NULL) {
- camel_operation_cancel (CAMEL_OPERATION (cancellable));
+ g_cancellable_cancel (cancellable);
g_object_unref (cancellable);
}
}
@@ -340,7 +340,7 @@ mail_cancel_hook_remove (GHook *hook)
void
mail_cancel_all (void)
{
- camel_operation_cancel (NULL);
+ camel_operation_cancel_all ();
g_mutex_lock (mail_msg_lock);