diff options
author | Not Zed <NotZed@Ximian.com> | 2001-08-08 17:37:40 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2001-08-08 17:37:40 +0800 |
commit | 5dfe756f5f673429b6579600053e35047a2fa3cf (patch) | |
tree | 5e8cdf7d51726e26ba2385f390b422aa08e3e35a /camel/camel-filter-search.c | |
parent | 3f704068b669debd2e5cedc9136d2196771b1e04 (diff) | |
download | gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.tar gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.tar.gz gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.tar.bz2 gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.tar.lz gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.tar.xz gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.tar.zst gsoc2013-evolution-5dfe756f5f673429b6579600053e35047a2fa3cf.zip |
Properly determine match type to pass to header_match.
2001-08-08 Not Zed <NotZed@Ximian.com>
* camel-filter-search.c (check_header): Properly determine match
type to pass to header_match.
(address_matches_exactly): Removed, effectively added to
camel_search_header_match.
* camel-folder-search.c (check_header): Properly determine the
match type to pass to header_match.
* camel-search-private.c (camel_search_header_match): Add a new
parameter 'type' which is the type of header we're matching
against. ASIS means utf8 format, ADDRESS means an internet
address ('formatted'), ADDRESS_ENCODED means a raw address header,
ENCODED means rfc 2047 encoded text.
(header_match): Move original logic here, have search_header_match
call it as appropriate for the 'type' of match.
2001-08-07 Not Zed <NotZed@Ximian.com>
* camel-session.c (camel_session_class_init): Only init the vee
provider struct once (if we're subclassed this will get called
multiple times).
* camel-object.c (obj_finalize): Removed a bit of a debug that
crept in with jacob's poolv patch (?).
svn path=/trunk/; revision=11772
Diffstat (limited to 'camel/camel-filter-search.c')
-rw-r--r-- | camel/camel-filter-search.c | 67 |
1 files changed, 14 insertions, 53 deletions
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c index 527e7cc0c1..bbfbac249f 100644 --- a/camel/camel-filter-search.c +++ b/camel/camel-filter-search.c @@ -104,42 +104,6 @@ static struct { { "get-size", (ESExpFunc *) get_size, 0 }, }; -static gboolean -address_matches_exactly (const char *header, const char *string) -{ - CamelInternetAddress *cia; - GCompareFunc compare; - const char *p; - - for (p = string; *p; p++) - if (isupper ((unsigned) *p)) - break; - - if (*p) - compare = (GCompareFunc) strcmp; - else - compare = (GCompareFunc) g_strcasecmp; - - /* the simple case? */ - if (!compare (header, string)) - return TRUE; - - cia = camel_internet_address_new (); - if (camel_address_decode (CAMEL_ADDRESS (cia), header) == 1) { - const char *name, *addr; - - camel_internet_address_get (cia, 0, &name, &addr); - if (!compare (name, string)) - return TRUE; - - if (!compare (addr, string)) - return TRUE; - } - camel_object_unref (CAMEL_OBJECT (cia)); - - return FALSE; -} - static ESExpResult * check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms, camel_search_match_t how) { @@ -150,24 +114,21 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMess if (argc > 1 && argv[0]->type == ESEXP_RES_STRING) { char *name = argv[0]->value.string; const char *header; - - if (g_strcasecmp (name, "x-camel-mlist") == 0) - header = camel_message_info_mlist (fms->info); - else - header = camel_medium_get_header (CAMEL_MEDIUM (fms->message), argv[0]->value.string); - + camel_search_t type = CAMEL_SEARCH_TYPE_ENCODED; + + if (strcasecmp(name, "x-camel-mlist") == 0) { + header = camel_message_info_mlist(fms->info); + type = CAMEL_SEARCH_TYPE_ASIS; + } 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) + type = CAMEL_SEARCH_TYPE_ADDRESS_ENCODED; + } + if (header) { - for (i = 1; i < argc && !matched; i++) { - if (argv[i]->type == ESEXP_RES_STRING) { - if (how == CAMEL_SEARCH_MATCH_EXACT - && (!g_strcasecmp (name, "To") - || !g_strcasecmp (name, "Cc") - || !g_strcasecmp (name, "From"))) - matched = address_matches_exactly (header, argv[i]->value.string); - else - matched = camel_search_header_match (header, argv[i]->value.string, how); - break; - } + for (i=1; i<argc && !matched; i++) { + if (argv[i]->type == ESEXP_RES_STRING) + matched = camel_search_header_match(header, argv[i]->value.string, how, type); } } } |