evolution-data-server r9663 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Tue Oct 14 05:21:08 2008
New Revision: 9663
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9663&view=rev

Log:
2008-10-06  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #554455

	* camel/camel-folder-search.c: Allow thread based searches by falling
	back on the old in-memory search model.




Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-folder-search.c

Modified: trunk/camel/camel-folder-search.c
==============================================================================
--- trunk/camel/camel-folder-search.c	(original)
+++ trunk/camel/camel-folder-search.c	Tue Oct 14 05:21:08 2008
@@ -422,8 +422,8 @@
 	
 	p->ex = ex;
 
-	/* We route body-contains search and uid search through memory and not via db. */
-	if (strstr((const char *) expr, "body-contains")) {
+	/* We route body-contains search and thread based search through memory and not via db. */
+	if (strstr((const char *) expr, "body-contains") || strstr((const char *) expr, "match-threads")) {
 		/* setup our search list only contains those we're interested in */
 		search->summary = camel_folder_get_summary(search->folder);
 
@@ -547,8 +547,8 @@
 	
 	p->ex = ex;
 
-	/* We route body-contains search and uid search through memory and not via db. */
-	if (uids || strstr((const char *) expr, "body-contains")) {
+	/* We route body-contains / thread based search and uid search through memory and not via db. */
+	if (uids || strstr((const char *) expr, "body-contains") || strstr((const char *) expr, "match-threads")) {
 		/* setup our search list only contains those we're interested in */
 		search->summary = camel_folder_get_summary(search->folder);