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-store-utils.c | |
| parent | 98462b59ec41432fe0334c473b4e4c11a0f3def6 (diff) | |
| download | gsoc2013-evolution-98f39d7ee0581aaa28c33564d9d6b27aa23028fa.tar.gz 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-store-utils.c')
| -rw-r--r-- | libemail-engine/e-mail-store-utils.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libemail-engine/e-mail-store-utils.c b/libemail-engine/e-mail-store-utils.c index 9719c0d353..bfb1ed5af3 100644 --- a/libemail-engine/e-mail-store-utils.c +++ b/libemail-engine/e-mail-store-utils.c @@ -180,7 +180,8 @@ mail_store_go_offline_thread (GSimpleAsyncResult *simple, disco_store, CAMEL_DISCO_STORE_OFFLINE, cancellable, &error); else - em_utils_disconnect_service_sync (service, TRUE, cancellable, &error); + camel_service_disconnect_sync ( + service, TRUE, cancellable, &error); } else if (CAMEL_IS_OFFLINE_STORE (store)) { CamelOfflineStore *offline_store; @@ -190,8 +191,10 @@ mail_store_go_offline_thread (GSimpleAsyncResult *simple, camel_offline_store_set_online_sync ( offline_store, FALSE, cancellable, &error); - } else - em_utils_disconnect_service_sync (service, TRUE, cancellable, &error); + } else { + camel_service_disconnect_sync ( + service, TRUE, cancellable, &error); + } if (error != NULL) g_simple_async_result_take_error (simple, error); @@ -210,10 +213,6 @@ e_mail_store_go_offline (CamelStore *store, g_return_if_fail (CAMEL_IS_STORE (store)); - /* Cancel any pending connect first so the set_offline_op - * thread won't get queued behind a hung connect op. */ - camel_service_cancel_connect (CAMEL_SERVICE (store)); - simple = g_simple_async_result_new ( G_OBJECT (store), callback, user_data, e_mail_store_go_offline); |