talons

commit 1dc842b0c1a0256ae63237475ac3516fd17cbeca
parent 7a457d9f8cb119e22ff42097b40cd7153a483dcf
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  8 Nov 2012 09:09:38 +0000

2012-11-08 [colin]	3.8.1cvs114

	* src/gtk/quicksearch.c
		Fix going active with NULL matchstring (for example
		when changing type before typing anything)

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

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-08 [colin]	3.8.1cvs114
+
+	* src/gtk/quicksearch.c
+		Fix going active with NULL matchstring (for example
+		when changing type before typing anything)
+
 2012-11-07 [colin]	3.8.1cvs113
 
 	* src/mbox.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4488,3 +4488,4 @@
 ( cvs diff -u -r 1.52.2.90 -r 1.52.2.91 src/prefs_folder_item.c;  ) > 3.8.1cvs111.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 doc/man/claws-mail.1;  cvs diff -u -r 1.1.2.117 -r 1.1.2.118 src/gtk/quicksearch.c;  ) > 3.8.1cvs112.patchset
 ( cvs diff -u -r 1.28.2.54 -r 1.28.2.55 src/mbox.c;  ) > 3.8.1cvs113.patchset
+( cvs diff -u -r 1.1.2.118 -r 1.1.2.119 src/gtk/quicksearch.c;  ) > 3.8.1cvs114.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=113
+EXTRA_VERSION=114
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -144,7 +144,8 @@ static void quicksearch_invoke_execute(QuickSearch *quicksearch, gboolean run_on
 	}
 
 	do {
-		gboolean active = g_strcmp0(quicksearch->request.matchstring, "");
+		gboolean active = quicksearch->request.matchstring != NULL 
+				   && g_strcmp0(quicksearch->request.matchstring, "");
 		advsearch_set(quicksearch->asearch, quicksearch->request.type,
 				quicksearch->request.matchstring);