diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-04-23 17:29:11 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-04-23 17:29:11 +0800 |
| commit | 71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8 (patch) | |
| tree | 2b20aee8c3343c30a43923c8abcff8ef55996cdd /mail/em-utils.c | |
| parent | 9364fe50368e2c48b1987edd43c92c1ecd1cd8cd (diff) | |
| download | gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.gz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.bz2 gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.lz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.xz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.zst gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.zip | |
** Fix for bug #529375
2008-04-23 Milan Crha <mcrha@redhat.com>
** Fix for bug #529375
* evolution-mail.schemas.in:
* mail-config.glade:
* em-utils.h: (em_utils_in_addressbook):
* em-utils.c: (em_utils_in_addressbook):
* em-format-html.c: (emfh_gethttp):
* mail-session.c: (lookup_addressbook):
* mail-config.h: (mail_config_get_lookup_book_local_only):
* mail-config.c: (struct MailConfig), (mail_config_init),
(mail_config_get_lookup_book_local_only):
* em-mailer-prefs.h: (struct _EMMailerPrefs):
* em-mailer-prefs.c: (junk_book_lookup_button_toggled),
(em_mailer_prefs_construct): Add new option
/apps/evolution/mail/junk/lookup_addressbook_local_only
to determine whether check for address in a local address book only.
svn path=/trunk/; revision=35410
Diffstat (limited to 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 53e2fff906..73379af0ed 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1976,7 +1976,7 @@ emu_addr_cancel_book(void *data) } gboolean -em_utils_in_addressbook(CamelInternetAddress *iaddr) +em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only) { GError *err = NULL; GSList *s, *g, *addr_sources = NULL; @@ -2027,6 +2027,9 @@ em_utils_in_addressbook(CamelInternetAddress *iaddr) /* FIXME: this aint threadsafe by any measure, but what can you do eh??? */ for (g = e_source_list_peek_groups(emu_addr_list);g;g=g_slist_next(g)) { + if (local_only && e_source_group_peek_base_uri ((ESourceGroup *)g->data) && !g_str_has_prefix (e_source_group_peek_base_uri ((ESourceGroup *)g->data), "file://")) + continue; + for (s = e_source_group_peek_sources((ESourceGroup *)g->data);s;s=g_slist_next(s)) { ESource *src = s->data; const char *completion = e_source_get_property (src, "completion"); |