From 41f0d7117eb958bd4a153c27e3cd0a58e14f4d75 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Nov 2011 01:21:10 -0400 Subject: Adapt to CamelOperation API changes. --- mail/em-utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mail/em-utils.c') diff --git a/mail/em-utils.c b/mail/em-utils.c index 67978884d0..399e51294b 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1458,7 +1458,7 @@ try_open_book_client (EBookClient *book_client, E_CLIENT (book_client), only_if_exists, cancellable, try_open_book_client_cb, &data); - while (canceled = camel_operation_cancel_check (NULL), + while (canceled = g_cancellable_is_cancelled (cancellable), !canceled && !e_flag_is_set (flag)) { GTimeVal wait; @@ -1690,8 +1690,6 @@ search_address_in_addressbooks (const gchar *address, mail_cancel_hook_remove (hook_stop); - stop = stop || camel_operation_cancel_check (NULL); - if (stop && !cached_book && book_client) { g_object_unref (book_client); } else if (!stop && book_client && !cached_book) { -- cgit v1.2.3