2012-11-08 [colin] 3.8.1cvs114
authorColin Leroy <colin@colino.net>
Thu, 8 Nov 2012 09:09:38 +0000 (09:09 +0000)
committerColin Leroy <colin@colino.net>
Thu, 8 Nov 2012 09:09:38 +0000 (09:09 +0000)
* src/gtk/quicksearch.c
Fix going active with NULL matchstring (for example
when changing type before typing anything)

ChangeLog
PATCHSETS
configure.ac
src/gtk/quicksearch.c

index 333ec66..a8f0812 100644 (file)
--- 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
 2012-11-07 [colin]     3.8.1cvs113
 
        * src/mbox.c
index 6f7a7ce..8124306 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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.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
index fba1a89..2a911a4 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=113
+EXTRA_VERSION=114
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a1dbafc..e6bd7af 100644 (file)
@@ -144,7 +144,8 @@ static void quicksearch_invoke_execute(QuickSearch *quicksearch, gboolean run_on
        }
 
        do {
        }
 
        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);
 
                advsearch_set(quicksearch->asearch, quicksearch->request.type,
                                quicksearch->request.matchstring);