evolution-data-server r9261 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Tue Aug  5 05:23:49 2008
New Revision: 9261
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9261&view=rev

Log:
2008-08-05  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #546184

	* camel/camel-folder-search.c: Search if we are under match_all.


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 Aug  5 05:23:49 2008
@@ -420,7 +420,8 @@
 
 	p->ex = ex;
 
-	if (strstr((const char *) expr, "body-contains")) {
+	/* We route body-contains search and uid search through memory and not via db. */
+	if (uids || strstr((const char *) expr, "body-contains")) {
 		/* setup our search list only contains those we're interested in */
 		search->summary = camel_folder_get_summary(search->folder);
 
@@ -782,7 +783,6 @@
 	}
 
 	/* cache this, so we only have to re-calculate once per search at most */
-	#warning "make search threads work well. Not sure if that works"
 	if (p->threads == NULL) {
 		p->threads = camel_folder_thread_messages_new(search->folder, NULL, TRUE);
 		p->threads_hash = g_hash_table_new(g_str_hash, g_str_equal);
@@ -1292,7 +1292,7 @@
 	
 	r(printf("executing user-tag\n"));
 	
-	if (argc == 1)
+	if (search->current && argc == 1)
 		value = camel_message_info_user_tag(search->current, argv[0]->value.string);
 	
 	r = e_sexp_result_new(f, ESEXP_RES_STRING);