talons

commit a45deacf14b838a5bb50cf502eecc42f8e58ce3b
parent a397d77d1f75b2be97f946f28ffaf452643a2965
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 12 Feb 2008 17:20:42 +0000

2008-02-12 [colin]	3.3.0cvs10

	* src/matcher.c
		Optimise matching on Found in addressbook if
		the matched header is in cache (From, etc)

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

4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12 [colin]	3.3.0cvs10
+
+	* src/matcher.c
+		Optimise matching on Found in addressbook if
+		the matched header is in cache (From, etc)
+
 2008-02-12 [colin]	3.3.0cvs9
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3223,3 +3223,4 @@
 ( cvs diff -u -r 1.382.2.436 -r 1.382.2.437 src/compose.c;  cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/export.c;  cvs diff -u -r 1.213.2.176 -r 1.213.2.177 src/folder.c;  cvs diff -u -r 1.87.2.53 -r 1.87.2.54 src/folder.h;  cvs diff -u -r 1.26.2.34 -r 1.26.2.35 src/foldersel.c;  cvs diff -u -r 1.4.12.5 -r 1.4.12.6 src/foldersel.h;  cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/imap_gtk.c;  cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/import.c;  cvs diff -u -r 1.274.2.232 -r 1.274.2.233 src/mainwindow.c;  cvs diff -u -r 1.94.2.170 -r 1.94.2.171 src/messageview.c;  cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/mh_gtk.c;  cvs diff -u -r 1.105.2.123 -r 1.105.2.124 src/prefs_account.c;  cvs diff -u -r 1.1.4.48 -r 1.1.4.49 src/prefs_filtering_action.c;  cvs diff -u -r 1.395.2.354 -r 1.395.2.355 src/summaryview.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.23.2.46 -r 1.23.2.47 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.3.0cvs7.patchset
 ( cvs diff -u -r 1.87.2.54 -r 1.87.2.55 src/folder.h;  ) > 3.3.0cvs8.patchset
 ( cvs diff -u -r 1.207.2.195 -r 1.207.2.196 src/folderview.c;  ) > 3.3.0cvs9.patchset
+( cvs diff -u -r 1.75.2.54 -r 1.75.2.55 src/matcher.c;  ) > 3.3.0cvs10.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=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/matcher.c b/src/matcher.c
@@ -1333,9 +1333,16 @@ 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:
-		return TRUE;
+		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;
 	default:
 		return FALSE;
 	}