diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-07-02 02:01:45 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-07-02 02:01:45 +0800 |
| commit | 7c6aa944e224b4f938cad03bc6531bc5430c9cdb (patch) | |
| tree | 65613f6ce5e64f12c945557ab1dd99ea36ac4b4e /mail/mail-ops.c | |
| parent | 6d8542a62879bd8b6f06e2679fc9f846ba497935 (diff) | |
| download | gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.tar gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.tar.gz gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.tar.bz2 gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.tar.lz gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.tar.xz gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.tar.zst gsoc2013-evolution-7c6aa944e224b4f938cad03bc6531bc5430c9cdb.zip | |
Bug #650671 - Service connect/disconnect not cancelled properly
Diffstat (limited to 'mail/mail-ops.c')
| -rw-r--r-- | mail/mail-ops.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 |