From: Christian Kellner <ckellner@openismus.com>
Date: Wed, 30 May 2007 13:31:45 +0000 (+0000)
Subject: 2007-05-30  Christian Kellner  <ckellner@openismus.com>
X-Git-Tag: git_migration_finished~3487
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=6a153ab24762f5cdae36dc59b5178f7a2d733c50

2007-05-30  Christian Kellner  <ckellner@openismus.com>

* src/modest-search.c: (modest_search):
	Correctly set part_search_func even if we have already parsed
	the query and thus a valid OgsTextSearcher object.

pmo-trunk-r1999
---

diff --git a/ChangeLog2 b/ChangeLog2
index a843da3..6570e9e 100644
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-05-30  Christian Kellner  <ckellner@openismus.com>
 
+	* src/modest-search.c: (modest_search):
+	Correctly set part_search_func even if we have already parsed
+	the query and thus a valid OgsTextSearcher object.
+
+2007-05-30  Christian Kellner  <ckellner@openismus.com>
+
 	* configure.ac:
 	Search and check for libogs.
 
diff --git a/src/modest-search.c b/src/modest-search.c
index a2417f5..92d0452 100644
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -226,13 +226,15 @@ modest_search (TnyFolder *folder, ModestSearch *search)
 	part_search_func = search_mime_part_strcmp;
 
 #ifdef MODEST_HAVE_OGS
-	if (search->flags & MODEST_SEARCH_USE_OGS &&
-	    search->text_searcher == NULL && search->query != NULL) {
-		OgsTextSearcher *text_searcher;	
+	if (search->flags & MODEST_SEARCH_USE_OGS) {
+	
+		if (search->text_searcher == NULL && search->query != NULL) {
+			OgsTextSearcher *text_searcher;	
 
-		text_searcher = ogs_text_searcher_new (FALSE);
-		ogs_text_searcher_parse_query (text_searcher, search->query);
-		search->text_searcher = text_searcher;
+			text_searcher = ogs_text_searcher_new (FALSE);
+			ogs_text_searcher_parse_query (text_searcher, search->query);
+			search->text_searcher = text_searcher;
+		}
 
 		part_search_func = search_mime_part_ogs;
 	}