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

1 files changed, 8 insertions, 1 deletions

diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
index 78e0eb192e..9b00f35060 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -36,11 +36,18 @@ typedef enum {
 	CAMEL_SEARCH_MATCH_SOUNDEX,
 } camel_search_match_t;
 
+typedef enum {
+	CAMEL_SEARCH_TYPE_ASIS,
+	CAMEL_SEARCH_TYPE_ENCODED,
+	CAMEL_SEARCH_TYPE_ADDRESS,
+	CAMEL_SEARCH_TYPE_ADDRESS_ENCODED,
+} camel_search_t;
+
 /* builds a regex that represents a string search */
 int camel_search_build_match_regex(regex_t *pattern, camel_search_flags_t type, int argc, struct _ESExpResult **argv, CamelException *ex);
 gboolean camel_search_message_body_contains(CamelDataWrapper *object, regex_t *pattern);
 
-gboolean camel_search_header_match(const char *value, const char *match, camel_search_match_t how);
+gboolean camel_search_header_match(const char *value, const char *match, camel_search_match_t how, camel_search_t type);
 gboolean camel_search_header_soundex(const char *header, const char *match);
 
 #endif /* ! _CAMEL_SEARCH_PRIVATE_H */