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/e-mail-session-utils.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/e-mail-session-utils.c')
| -rw-r--r-- | mail/e-mail-session-utils.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c index 4e90a19ecf..823852ed21 100644 --- a/mail/e-mail-session-utils.c +++ b/mail/e-mail-session-utils.c @@ -22,6 +22,8 @@ #include "e-mail-session-utils.h" +#include "em-utils.h" + #include <glib/gi18n-lib.h> #include <mail/mail-tools.h> @@ -423,7 +425,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, did_connect = TRUE; /* XXX This API does not allow for cancellation. */ - if (!camel_service_connect_sync (service, &error)) { + if (!em_utils_connect_service_sync (service, cancellable, &error)) { g_simple_async_result_set_from_error (simple, error); g_error_free (error); return; @@ -441,7 +443,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, context->recipients, cancellable, &error); if (did_connect) - camel_service_disconnect_sync (service, error == NULL, error ? NULL : &error); + em_utils_disconnect_service_sync (service, error == NULL, cancellable, error ? NULL : &error); if (error != NULL) { g_simple_async_result_set_from_error (simple, error); @@ -871,8 +873,8 @@ e_mail_session_unsubscribe_folder_sync (EMailSession *session, /* FIXME This should take our GCancellable. */ success = - camel_service_connect_sync ( - CAMEL_SERVICE (store), error) && + em_utils_connect_service_sync ( + CAMEL_SERVICE (store), cancellable, error) && camel_store_unsubscribe_folder_sync ( store, folder_name, cancellable, error); |