diff options
| author | Dan Vrátil <dvratil@redhat.com> | 2012-06-14 19:01:57 +0800 |
|---|---|---|
| committer | Dan Vrátil <dvratil@redhat.com> | 2012-06-14 19:01:57 +0800 |
| commit | e439e17e2e14fc5a3a35924dddfdd4d8602c3d8c (patch) | |
| tree | c8d693bcfd659383bbcb81dd414d805f8efc1c19 | |
| parent | a83eda3085e9143143ed0b0e37f939774a5bd472 (diff) | |
| download | gsoc2013-evolution-e439e17e2e14fc5a3a35924dddfdd4d8602c3d8c.tar.gz gsoc2013-evolution-e439e17e2e14fc5a3a35924dddfdd4d8602c3d8c.tar.zst gsoc2013-evolution-e439e17e2e14fc5a3a35924dddfdd4d8602c3d8c.zip | |
Make em_utils_in_addressbook() cancellable
| -rw-r--r-- | libemail-engine/e-mail-session.c | 2 | ||||
| -rw-r--r-- | libemail-engine/e-mail-utils.c | 5 | ||||
| -rw-r--r-- | libemail-engine/e-mail-utils.h | 3 | ||||
| -rw-r--r-- | mail/e-http-request.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c index a319a88815..4b4cdf2122 100644 --- a/libemail-engine/e-mail-session.c +++ b/libemail-engine/e-mail-session.c @@ -1329,7 +1329,7 @@ mail_session_lookup_addressbook (CamelSession *session, addr = camel_internet_address_new (); camel_address_decode ((CamelAddress *) addr, name); ret = em_utils_in_addressbook ( - registry, addr, mail_config_get_lookup_book_local_only ()); + registry, addr, mail_config_get_lookup_book_local_only (), NULL); g_object_unref (addr); return ret; diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index 7fca5eb306..964de9810f 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -600,7 +600,8 @@ search_address_in_addressbooks (ESourceRegistry *registry, gboolean em_utils_in_addressbook (ESourceRegistry *registry, CamelInternetAddress *iaddr, - gboolean local_only) + gboolean local_only, + GCancellable *cancellable) { const gchar *addr; @@ -611,7 +612,7 @@ em_utils_in_addressbook (ESourceRegistry *registry, return FALSE; return search_address_in_addressbooks ( - registry, addr, local_only, NULL, NULL, NULL); + registry, addr, local_only, NULL, NULL, cancellable); } static gboolean diff --git a/libemail-engine/e-mail-utils.h b/libemail-engine/e-mail-utils.h index 8898204ef1..812dde2dfb 100644 --- a/libemail-engine/e-mail-utils.h +++ b/libemail-engine/e-mail-utils.h @@ -35,7 +35,8 @@ gboolean em_utils_folder_is_outbox (ESourceRegistry *registry, CamelFolder *folder); gboolean em_utils_in_addressbook (ESourceRegistry *registry, CamelInternetAddress *addr, - gboolean local_only); + gboolean local_only, + GCancellable *cancellable); CamelMimePart * em_utils_contact_photo (ESourceRegistry *registry, CamelInternetAddress *addr, gboolean local, diff --git a/mail/e-http-request.c b/mail/e-http-request.c index 95a97e62f6..f5fd12fe40 100644 --- a/mail/e-http-request.c +++ b/mail/e-http-request.c @@ -340,7 +340,7 @@ handle_http_request (GSimpleAsyncResult *res, registry = e_shell_get_registry (shell); addr = camel_mime_message_get_from (part_list->message); force_load_images = em_utils_in_addressbook ( - registry, addr, FALSE); + registry, addr, FALSE, cancellable); } g_free (decoded_uri); |