From 74291416825aaa4e571c22087818a932307aa301 Mon Sep 17 00:00:00 2001 From: Michael Zucci Date: Mon, 22 Oct 2001 21:08:05 +0000 Subject: 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 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 --- camel/camel-filter-search.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'camel/camel-filter-search.c') diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c index 9366a2f610..7b59622788 100644 --- a/camel/camel-filter-search.c +++ b/camel/camel-filter-search.c @@ -34,6 +34,10 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include "e-util/e-sexp.h" @@ -123,7 +127,7 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMess if (strcasecmp(name, "x-camel-mlist") == 0) { header = camel_message_info_mlist(fms->info); - type = CAMEL_SEARCH_TYPE_ASIS; + type = CAMEL_SEARCH_TYPE_MLIST; } else { header = camel_medium_get_header(CAMEL_MEDIUM(fms->message), argv[0]->value.string); if (strcasecmp("to", name) == 0 || strcasecmp("cc", name) == 0 || strcasecmp("from", name) == 0) @@ -138,8 +142,7 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMess if (header) { for (i=1; itype == ESEXP_RES_STRING) - matched = camel_search_header_match(header, argv[i]->value.string, - how, type, charset); + matched = camel_search_header_match(header, argv[i]->value.string, how, type, charset); } } } -- cgit v1.2.3