CVS: sylpheed-claws/src/gtk quicksearch.c,1.1.2.40,1.1.2.41

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18030/src/gtk

Modified Files:
      Tag: gtk2
	quicksearch.c 
Log Message:
2006-04-20 [paul]	2.1.1cvs17

	* src/gtk/quicksearch.c
		fix standard, non-extended Quick search,
		was broken in 2.1.1cvs15.
		Thanks to Colin. 

Index: quicksearch.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk/quicksearch.c,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -r1.1.2.40 -r1.1.2.41
--- quicksearch.c	19 Apr 2006 17:28:39 -0000	1.1.2.40
+++ quicksearch.c	20 Apr 2006 11:57:57 -0000	1.1.2.41
@@ -550,7 +550,9 @@
 
 gboolean quicksearch_is_active(QuickSearch *quicksearch)
 {
-	return quicksearch->active && (quicksearch->matcher_list != NULL);
+	return quicksearch->active && 
+		(prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED
+		 || quicksearch->matcher_list != NULL);
 }
 
 static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
@@ -575,7 +577,9 @@
 
 	quicksearch->active = active;
 
-	if (active && quicksearch->matcher_list == NULL)
+	if (active && 
+		(prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED
+		 && quicksearch->matcher_list == NULL))
 		error = TRUE;
 
 	if (active) {



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642