talons

commit 53d41d87eaba76672b03ce8f273bb85cae32a3e3
parent 5bf542dc47d97400d96b67a0a8535d1622819056
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 21 Sep 2012 12:42:52 +0000

2012-09-21 [colin]	3.8.1cvs69

	* src/gtk/quicksearch.c
		Fix error background not appearing

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/quicksearch.c
 | 
3
++-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-21 [colin]	3.8.1cvs69
+
+	* src/gtk/quicksearch.c
+		Fix error background not appearing
+
 2012-09-21 [colin]	3.8.1cvs68
 
 	* src/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -4443,3 +4443,4 @@
 ( cvs diff -u -r 1.60.2.151 -r 1.60.2.152 src/addressbook.c;  cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/addrselect.c;  ) > 3.8.1cvs66.patchset
 ( cvs diff -u -r 1.274.2.352 -r 1.274.2.353 src/mainwindow.c;  ) > 3.8.1cvs67.patchset
 ( cvs diff -u -r 1.155.2.102 -r 1.155.2.103 src/Makefile.am;  diff -u /dev/null src/advsearch.c;  diff -u /dev/null src/advsearch.h;  cvs diff -u -r 1.213.2.211 -r 1.213.2.212 src/folder.c;  cvs diff -u -r 1.87.2.67 -r 1.87.2.68 src/folder.h;  cvs diff -u -r 1.207.2.229 -r 1.207.2.230 src/folderview.c;  cvs diff -u -r 1.179.2.262 -r 1.179.2.263 src/imap.c;  cvs diff -u -r 1.115.2.257 -r 1.115.2.258 src/main.c;  cvs diff -u -r 1.75.2.75 -r 1.75.2.76 src/matcher.c;  cvs diff -u -r 1.39.2.21 -r 1.39.2.22 src/matcher.h;  diff -u /dev/null src/matchertypes.h;  cvs diff -u -r 1.79.2.76 -r 1.79.2.77 src/mh.c;  cvs diff -u -r 1.83.2.195 -r 1.83.2.196 src/mimeview.c;  cvs diff -u -r 1.101.2.72 -r 1.101.2.73 src/news.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/proctypes.h;  cvs diff -u -r 1.15.2.70 -r 1.15.2.71 src/summary_search.c;  cvs diff -u -r 1.395.2.453 -r 1.395.2.454 src/summaryview.c;  cvs diff -u -r 1.68.2.61 -r 1.68.2.62 src/summaryview.h;  cvs diff -u -r 1.1.2.111 -r 1.1.2.112 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/gtk/quicksearch.h;  ) > 3.8.1cvs68.patchset
+( cvs diff -u -r 1.1.2.112 -r 1.1.2.113 src/gtk/quicksearch.c;  ) > 3.8.1cvs69.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -109,13 +109,14 @@ static void quicksearch_invoke_execute(QuickSearch *quicksearch, gboolean run_on
 	}
 
 	do {
+		gboolean active = g_strcmp0(quicksearch->request.matchstring, "");
 		advsearch_set(quicksearch->asearch, quicksearch->request.type,
 				quicksearch->request.matchstring);
 
 		if (run_only_if_fast && !advsearch_is_fast(quicksearch->asearch))
 			return;
 
-		quicksearch_set_active(quicksearch, advsearch_has_proper_predicate(quicksearch->asearch));
+		quicksearch_set_active(quicksearch, active);
 
 		quicksearch->want_reexec = FALSE;
 		quicksearch_set_running(quicksearch, TRUE);