diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-08 19:48:40 +0800 |
| commit | 1107fea0f8edff76d5956426044c9afe41c387fa (patch) | |
| tree | 3140debb1cef6c058425360e0c43b6c55da75f3a /mail/em-utils.c | |
| parent | ceda5ef420b4a4b97ce0011d49be3f96e857c9ef (diff) | |
| parent | 88d5608a97ebaee9c04c3e8ac6b79278e824ecee (diff) | |
| download | gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.gz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.bz2 gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.lz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.xz gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.tar.zst gsoc2013-evolution-1107fea0f8edff76d5956426044c9afe41c387fa.zip | |
Merge branch 'master' into wip/gsettings
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) { |