talons

commit 2258ee9e24d5ae4db453d67fc344cdacddd286fb
parent dc972352b438b96729fe39de5014d670fbedcc14
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  4 Oct 2012 09:48:21 +0000

2012-10-04 [colin]	3.8.1cvs83

	* src/advsearch.c
		Fix double-tag search. Maybe fixes bug #2744,
		'Quick search throws bad command argument
		error since recent change'. Patch by Sean.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/advsearch.c
 | 
1
-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-04 [colin]	3.8.1cvs83
+
+	* src/advsearch.c
+		Fix double-tag search. Maybe fixes bug #2744,
+		'Quick search throws bad command argument 
+		error since recent change'. Patch by Sean.
+
 2012-10-03 [mones]	3.8.1cvs82
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4457,3 +4457,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/advsearch.c;  cvs diff -u -r 1.179.2.264 -r 1.179.2.265 src/imap.c;  cvs diff -u -r 1.1.4.121 -r 1.1.4.122 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/etpan/imap-thread.h;  ) > 3.8.1cvs80.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/advsearch.c;  cvs diff -u -r 1.179.2.265 -r 1.179.2.266 src/imap.c;  ) > 3.8.1cvs81.patchset
 ( cvs diff -u -r 1.49.2.152 -r 1.49.2.153 src/procmime.c;  ) > 3.8.1cvs82.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/advsearch.c;  ) > 3.8.1cvs83.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=82
+EXTRA_VERSION=83
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/advsearch.c b/src/advsearch.c
@@ -377,7 +377,6 @@ static void prepare_matcher_mixed(AdvancedSearch *search)
 	prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
 	prepare_matcher_header(search, MATCHCRITERIA_FROM);
 	prepare_matcher_header(search, MATCHCRITERIA_TO);
-	prepare_matcher_header(search, MATCHCRITERIA_TAG);
 }
 
 static void prepare_matcher(AdvancedSearch *search)