diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-10 08:11:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:11 +0800 |
| commit | 4d58a800fa36927567f6c0d22617c260e8e7172b (patch) | |
| tree | f4284e5454469b21c9c8772b1b6a35805c60bc1d /libemail-engine | |
| parent | 77fc81f8c9116f28016318aa1e00454abde970e8 (diff) | |
| download | gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.tar gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.tar.gz gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.tar.bz2 gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.tar.lz gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.tar.xz gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.tar.zst gsoc2013-evolution-4d58a800fa36927567f6c0d22617c260e8e7172b.zip | |
Use e_source_registry_list_enabled() where appropriate.
Diffstat (limited to 'libemail-engine')
| -rw-r--r-- | libemail-engine/e-mail-folder-utils.c | 5 | ||||
| -rw-r--r-- | libemail-engine/e-mail-utils.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c index bd45f35702..4047e0e759 100644 --- a/libemail-engine/e-mail-folder-utils.c +++ b/libemail-engine/e-mail-folder-utils.c @@ -286,7 +286,7 @@ mail_folder_expunge_pop3_stores (CamelFolder *folder, } extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT; - list = e_source_registry_list_sources (registry, extension_name); + list = e_source_registry_list_enabled (registry, extension_name); for (link = list; link != NULL; link = g_list_next (link)) { ESource *source = E_SOURCE (link->data); @@ -306,8 +306,7 @@ mail_folder_expunge_pop3_stores (CamelFolder *folder, extension = e_source_get_extension (source, extension_name); backend_name = e_source_backend_get_backend_name (extension); - if (!e_source_registry_check_enabled (registry, source) || - g_strcmp0 (backend_name, "pop") != 0) + if (g_strcmp0 (backend_name, "pop") != 0) continue; service = camel_session_ref_service ( diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index 7b406ec9ab..c6aff21595 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -552,7 +552,7 @@ second_preference: } extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT; - list = e_source_registry_list_sources (registry, extension_name); + list = e_source_registry_list_enabled (registry, extension_name); if (sort_func) sort_func (&list, sort_func_data); @@ -560,8 +560,7 @@ second_preference: for (iter = list; iter != NULL; iter = g_list_next (iter)) { ESource *temp = E_SOURCE (iter->data); - if (e_source_registry_check_enabled (registry, temp) && - mail_account_in_recipients (registry, temp, recipients)) { + if (mail_account_in_recipients (registry, temp, recipients)) { source = g_object_ref (temp); break; } |