diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-05-19 23:11:58 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-05-20 01:35:28 +0800 |
| commit | 98f39d7ee0581aaa28c33564d9d6b27aa23028fa (patch) | |
| tree | a55d7307795a07022afc53d0a030639bfabab45f /libemail-engine/e-mail-session-utils.c | |
| parent | 98462b59ec41432fe0334c473b4e4c11a0f3def6 (diff) | |
| download | gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar.gz gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar.bz2 gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar.lz gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar.xz gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar.zst gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.zip | |
Adapt to CamelService API changes.
em_utils_connect_service_sync() and em_utils_disconnect_service_sync()
are no longer needed. CamelService itself now effectively does what
these functions were doing.
Diffstat (limited to 'libemail-engine/e-mail-session-utils.c')
| -rw-r--r-- | libemail-engine/e-mail-session-utils.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c index 403ba57ae9..de1dec1713 100644 --- a/libemail-engine/e-mail-session-utils.c +++ b/libemail-engine/e-mail-session-utils.c @@ -426,8 +426,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, if (status != CAMEL_SERVICE_CONNECTED) { did_connect = TRUE; - /* XXX This API does not allow for cancellation. */ - em_utils_connect_service_sync ( + camel_service_connect_sync ( service, cancellable, &error); if (error != NULL) { @@ -447,7 +446,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, context->recipients, cancellable, &error); if (did_connect) - em_utils_disconnect_service_sync ( + camel_service_disconnect_sync ( service, error == NULL, cancellable, error ? NULL : &error); @@ -896,9 +895,8 @@ e_mail_session_unsubscribe_folder_sync (EMailSession *session, message = _("Unsubscribing from folder '%s'"); camel_operation_push_message (cancellable, message, folder_name); - /* FIXME This should take our GCancellable. */ success = - em_utils_connect_service_sync ( + camel_service_connect_sync ( CAMEL_SERVICE (store), cancellable, error) && camel_subscribable_unsubscribe_folder_sync ( CAMEL_SUBSCRIBABLE (store), |