diff options
author | Michael Zucci <zucchi@src.gnome.org> | 2001-10-23 05:08:05 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2001-10-23 05:08:05 +0800 |
commit | 74291416825aaa4e571c22087818a932307aa301 (patch) | |
tree | d0a1a0094831c49f80998ad2c86ba5c8c2f3a1e9 /camel/camel-search-private.c | |
parent | 746bfdb6c34da2c53de84e0b8780c39920375ad2 (diff) | |
download | gsoc2013-evolution-74291416825aaa4e571c22087818a932307aa301.tar.gz gsoc2013-evolution-74291416825aaa4e571c22087818a932307aa301.tar.zst gsoc2013-evolution-74291416825aaa4e571c22087818a932307aa301.zip |
Use search_type_mlist for mailing list searches.
* camel-filter-search.c, camel-folder-search.c (check_header): Use
search_type_mlist for mailing list searches.
* camel.c (camel_init): call camel-mime-utils-init func.
* camel-mime-utils.c: Changed mail mail_list_magic to include a
domain part, also pre-compile all the patterns. They are all
backward compatible except List-Id: which now uses the
mail-address-like <list-name.host.name> part rather than the
plain-text part (which might've been blank anyway).
(camel_mime_utils_init): Initialisation function to setup any
static data required by camel-mime-utils at run-time. We now
setup the base64/charset class tables here, so it doesn't need to
be done statically.
(camel_mime_special_table, camel_mime_base64_rank): No longer
statically initialise these.
(main): Removed + the tests at the end of the file.
(header_raw_check_mailing_list): Dont compile regex's here,
already compiled in utils_init. Use the regex patterns to remove
leading <'s from addresses. Also, if there is a domain part
matched, add that after a '@' is added.
camel-search-private.c:
(camel_search_header_match): Added SEARCH_TYPE_MLIST for mlist
search types. It ignores the domain part if either (but not both)
of the values dont have it.
svn path=/trunk/; revision=13894
Diffstat (limited to 'camel/camel-search-private.c')
-rw-r--r-- | camel/camel-search-private.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c index 5427e6a365..3369409936 100644 --- a/camel/camel-search-private.c +++ b/camel/camel-search-private.c @@ -398,7 +398,7 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma const char *name, *addr; int truth = FALSE, i; CamelInternetAddress *cia; - char *v; + char *v, *vdom, *mdom; while (*value && isspace (*value)) value++; @@ -409,6 +409,25 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma truth = header_match(v, match, how); g_free(v); break; + case CAMEL_SEARCH_TYPE_MLIST: + /* Special mailing list old-version domain hack + If one of the mailing list names doesn't have an @ in it, its old-style, so + only match against the pre-domain part, which should be common */ + + vdom = strchr(value, '@'); + mdom = strchr(match, '@'); + if (mdom == NULL && vdom != NULL) { + v = alloca(vdom-value+1); + memcpy(v, value, vdom-value); + v[vdom-value] = 0; + value = (char *)v; + } else if (mdom != NULL && vdom == NULL) { + v = alloca(mdom-match+1); + memcpy(v, match, mdom-match); + v[mdom-match] = 0; + match = (char *)v; + } + /* Falls through */ case CAMEL_SEARCH_TYPE_ASIS: truth = header_match(value, match, how); break; |