diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-05 13:21:10 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-07 09:10:57 +0800 |
| commit | 41f0d7117eb958bd4a153c27e3cd0a58e14f4d75 (patch) | |
| tree | 472b21d27779f0c4cfc55869532b35ae85ef7f8c /mail/em-utils.c | |
| parent | 8382a9cbfb2c58cee99c34a93d027a50a1bf695c (diff) | |
| download | gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.gz gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.bz2 gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.lz gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.xz gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.tar.zst gsoc2013-evolution-41f0d7117eb958bd4a153c27e3cd0a58e14f4d75.zip | |
Adapt to CamelOperation API changes.
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 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) { |