talons

commit 2bb3952356bf2afa354ffeae3562053345cd398b
parent b59a753f22d378e2cac545f238629d4f950e201a
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Thu,  4 Nov 2010 05:49:54 +0000

2010-11-04 [wwp]	3.7.6cvs62

	* src/filtering.c
		Fix bug 2293, "filtering: simplify expression", as simplifying
		this expression doesn't make it less easy to understand and we
		gain few cycles by making the logical expression more simple
		by applying. Patch by Nicolas Kaiser.

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

4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-04 [wwp]	3.7.6cvs62
+
+	* src/filtering.c
+		Fix bug 2293, "filtering: simplify expression", as simplifying
+		this expression doesn't make it less easy to understand and we
+		gain few cycles by making the logical expression more simple
+		by applying. Patch by Nicolas Kaiser.
+
 2010-11-03 [colin]	3.7.6cvs61
 
 	* src/addrindex.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4057,3 +4057,4 @@
 ( cvs diff -u -r 1.101.2.61 -r 1.101.2.62 src/news.c;  ) > 3.7.6cvs59.patchset
 ( cvs diff -u -r 1.12.2.61 -r 1.12.2.62 src/action.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/statusbar.c;  cvs diff -u -r 1.43.2.120 -r 1.43.2.121 src/toolbar.c;  ) > 3.7.6cvs60.patchset
 ( cvs diff -u -r 1.28.2.43 -r 1.28.2.44 src/addrindex.c;  ) > 3.7.6cvs61.patchset
+( cvs diff -u -r 1.60.2.55 -r 1.60.2.56 src/filtering.c;  ) > 3.7.6cvs62.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/filtering.c b/src/filtering.c
@@ -823,9 +823,10 @@ static gboolean filter_msginfo(GSList * filtering_list, MsgInfo * info, PrefsAcc
 		}
 	}
 
-	/* put in inbox if a final rule could not be applied, or
-	 * the last rule was not a final one. */
-	if ((final && !apply_next) || !final) {
+    /* put in inbox if the last rule was not a final one, or
+     * a final rule could not be applied.
+     * Either of these cases is likely. */
+    if (!final || !apply_next) {
 		return FALSE;
 	}