talons

commit b15bd9cc48ed42fda7de21bc09fba397adbf386a
parent 485639046096e8d8902c8ae2ac94bf99704a7c9c
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 15 Feb 2008 14:59:39 +0000

2008-02-15 [colin]	3.3.0cvs14

	* src/matcher.c
		Revert cvs10 for now, it breaks the feature

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/matcher.c
 | 
9
+--------

4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-15 [colin]	3.3.0cvs14
+
+	* src/matcher.c
+		Revert cvs10 for now, it breaks the feature
+
 2008-02-15 [colin]	3.3.0cvs13
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3227,3 +3227,4 @@
 ( cvs diff -u -r 1.179.2.209 -r 1.179.2.210 src/imap.c;  cvs diff -u -r 1.1.4.96 -r 1.1.4.97 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/etpan/imap-thread.h;  ) > 3.3.0cvs11.patchset
 ( cvs diff -u -r 1.207.2.196 -r 1.207.2.197 src/folderview.c;  ) > 3.3.0cvs12.patchset
 ( cvs diff -u -r 1.115.2.186 -r 1.115.2.187 src/main.c;  cvs diff -u -r 1.382.2.437 -r 1.382.2.438 src/compose.c;  ) > 3.3.0cvs13.patchset
+( cvs diff -u -r 1.75.2.55 -r 1.75.2.56 src/matcher.c;  ) > 3.3.0cvs14.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/matcher.c b/src/matcher.c
@@ -1333,16 +1333,9 @@ static gboolean matcherprop_criteria_headers(const MatcherProp *matcher)
 	case MATCHCRITERIA_NOT_HEADER:
 	case MATCHCRITERIA_HEADERS_PART:
 	case MATCHCRITERIA_NOT_HEADERS_PART:
-		return TRUE;
 	case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
 	case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
-		if (!strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) ||
-		    !strcasecmp(matcher->header, _("Any")) ||
-		    !strcasecmp(matcher->header, "Sender") ||
-		    !strcasecmp(matcher->header, "Reply-To"))
-			return TRUE;
-		else
-			return FALSE;
+		return TRUE;
 	default:
 		return FALSE;
 	}