evolution-data-server r9453 - trunk/camel

[lucilanga svn gnome org]

Author: lucilanga
Date: Sun Aug 31 16:23:53 2008
New Revision: 9453
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9453&view=rev

Log:
2008-08-31  Lucian Langa  <lucilanga gnome org>

** Fix for bug #550072

* camel/camel-search-private.c: Allow evolution-rss content type
on body-search

Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-filter-search.c
   trunk/camel/camel-search-private.c

Modified: trunk/camel/camel-filter-search.c
==============================================================================
--- trunk/camel/camel-filter-search.c	(original)
+++ trunk/camel/camel-filter-search.c	Sun Aug 31 16:23:53 2008
@@ -341,6 +341,7 @@
 	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);
 	CamelMimeMessage *message;
 	regex_t pattern;
+	g_print("body contains\n");
 	
 	if (camel_search_build_match_regex (&pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, fms->ex) == 0) {
 		message = camel_filter_search_get_message (fms, f);

Modified: trunk/camel/camel-search-private.c
==============================================================================
--- trunk/camel/camel-search-private.c	(original)
+++ trunk/camel/camel-search-private.c	Sun Aug 31 16:23:53 2008
@@ -508,7 +508,8 @@
 	} 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 (camel_content_type_is(CAMEL_DATA_WRAPPER (containee)->mime_type, "text", "*") 
+		|| camel_content_type_is(CAMEL_DATA_WRAPPER (containee)->mime_type, "x-evolution", "evolution-rss-feed")) {
 		/* for all other text parts, we look inside, otherwise we dont care */
 		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new ();