From a57097559c1c3985a20af5be9be50e489ddee001 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 1 Jul 2011 20:01:45 +0200 Subject: Bug #650671 - Service connect/disconnect not cancelled properly --- mail/mail-ops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/mail-ops.c') diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 0b3e27d24e..cf8453a953 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -339,7 +339,7 @@ fail: /* also disconnect if not a local delivery mbox; there is no need to keep the connection alive forever */ if (!is_local_delivery) - camel_service_disconnect_sync (CAMEL_SERVICE (m->store), TRUE, NULL); + em_utils_disconnect_service_sync (CAMEL_SERVICE (m->store), TRUE, cancellable, NULL); } static void @@ -580,8 +580,8 @@ mail_send_message (struct _send_queue_msg *m, } if (camel_address_length (recipients) > 0) { - if (!camel_service_connect_sync ( - CAMEL_SERVICE (transport), error)) + if (!em_utils_connect_service_sync ( + CAMEL_SERVICE (transport), cancellable, error)) goto exit; if (!camel_transport_send_to_sync ( @@ -1597,7 +1597,7 @@ disconnect_service_exec (struct _disconnect_msg *m, GCancellable *cancellable, GError **error) { - camel_service_disconnect_sync (CAMEL_SERVICE (m->store), TRUE, error); + em_utils_disconnect_service_sync (CAMEL_SERVICE (m->store), TRUE, cancellable, error); } static void -- cgit v1.2.3