From 98f39d7ee0581aaa28c33564d9d6b27aa23028fa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 19 May 2012 11:11:58 -0400 Subject: 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. --- libemail-engine/e-mail-session-utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libemail-engine/e-mail-session-utils.c') 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), -- cgit v1.2.3