From: Colin Leroy <colin@colino.net>
Date: Wed, 18 Oct 2006 19:35:07 +0000 (+0000)
Subject: 2006-10-18 [colin]	2.5.5cvs17
X-Git-Tag: rel_2_6_0~25
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2352178a0ef1b8b3001a38089afcfd0d196a5be1

2006-10-18 [colin]	2.5.5cvs17

	* src/gtk/quicksearch.c
		Remove "save to history only if there's
		no syntax error", it breaks for some
		reason which I'll investigate later.
---

diff --git a/ChangeLog b/ChangeLog
index cbc2ecf90..ed69007ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-18 [colin]	2.5.5cvs17
+
+	* src/gtk/quicksearch.c
+		Remove "save to history only if there's
+		no syntax error", it breaks for some 
+		reason which I'll investigate later.
+
 2006-10-18 [colin]	2.5.5cvs16
 
 	* src/prefs_common.c
diff --git a/PATCHSETS b/PATCHSETS
index ecd65bcb6..1678b6fc6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2002,3 +2002,4 @@
 ( cvs diff -u -r 1.382.2.316 -r 1.382.2.317 src/compose.c;  ) > 2.5.5cvs14.patchset
 ( cvs diff -u -r 1.382.2.317 -r 1.382.2.318 src/compose.c;  cvs diff -u -r 1.50.2.27 -r 1.50.2.28 src/compose.h;  ) > 2.5.5cvs15.patchset
 ( cvs diff -u -r 1.204.2.105 -r 1.204.2.106 src/prefs_common.c;  cvs diff -u -r 1.103.2.63 -r 1.103.2.64 src/prefs_common.h;  cvs diff -u -r 1.395.2.263 -r 1.395.2.264 src/summaryview.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/quicksearch.h;  ) > 2.5.5cvs16.patchset
+( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/gtk/quicksearch.c;  ) > 2.5.5cvs17.patchset
diff --git a/configure.ac b/configure.ac
index e62a61f83..c3fc659a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 30121ffc1..c38f4c6a3 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -163,15 +163,11 @@ static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
 
 	/* add to history */
 	if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
-		/* only if there's no syntax error */
-		if (quicksearch->matcher_list != NULL ||
-		    prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED) {
-			prefs_common.summary_quicksearch_history =
-				add_history(prefs_common.summary_quicksearch_history,
-						search_string);
-			gtk_combo_set_popdown_strings(GTK_COMBO(quicksearch->search_string_entry),
-				prefs_common.summary_quicksearch_history);
-		}
+		prefs_common.summary_quicksearch_history =
+			add_history(prefs_common.summary_quicksearch_history,
+					search_string);
+		gtk_combo_set_popdown_strings(GTK_COMBO(quicksearch->search_string_entry),
+			prefs_common.summary_quicksearch_history);
 	}
 
 	prepare_matcher(quicksearch);