aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-search-private.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2003-08-27 02:16:51 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-08-27 02:16:51 +0800
commit04b9ec51d45f2efb3b8118eef99c7592ba269792 (patch)
tree2ed61b2ef50a2f74fcc4911b1145367514d721e7 /camel/camel-search-private.c
parent173fc4ff4c7f267cefeeeed0a7a93a7f1f245c62 (diff)
downloadgsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.gz
gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.zst
gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.zip
temporarily reverting my camel namespace patches until after we merge in some of the other branches
svn path=/trunk/; revision=22373
Diffstat (limited to 'camel/camel-search-private.c')
-rw-r--r--camel/camel-search-private.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 2ba908bea3..7cadbd525a 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -408,7 +408,7 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma
switch(type) {
case CAMEL_SEARCH_TYPE_ENCODED:
- v = camel_header_decode_string(value, default_charset); /* FIXME: Find header charset */
+ v = header_decode_string(value, default_charset); /* FIXME: Find header charset */
truth = header_match(v, match, how);
g_free(v);
break;
@@ -449,8 +449,8 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma
for (i=0; !truth && camel_internet_address_get(cia, i, &name, &addr);i++)
truth = (name && header_match(name, match, how)) || (addr && header_match(addr, match, how));
-
- camel_object_unref (cia);
+
+ camel_object_unref((CamelObject *)cia);
break;
}
@@ -482,14 +482,14 @@ camel_search_message_body_contains (CamelDataWrapper *object, regex_t *pattern)
} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
/* for messages we only look at its contents */
truth = camel_search_message_body_contains ((CamelDataWrapper *)containee, pattern);
- } else if (camel_content_type_is(CAMEL_DATA_WRAPPER (containee)->mime_type, "text", "*")) {
+ } else if (header_content_type_is(CAMEL_DATA_WRAPPER (containee)->mime_type, "text", "*")) {
/* for all other text parts, we look inside, otherwise we dont care */
CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new ();
camel_data_wrapper_write_to_stream (containee, CAMEL_STREAM (mem));
camel_stream_write (CAMEL_STREAM (mem), "", 1);
truth = regexec (pattern, mem->buffer->data, 0, NULL, 0) == 0;
- camel_object_unref (mem);
+ camel_object_unref (CAMEL_OBJECT (mem));
}
return truth;