diff options
Diffstat (limited to 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index ed57335f17..a3e9a049d6 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1456,7 +1456,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; @@ -1688,8 +1688,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) { |