From: Tristan Chabredier <wwp@claws-mail.org>
Date: Fri, 5 Oct 2007 14:29:26 +0000 (+0000)
Subject: 2007-10-05 [wwp]	3.0.2cvs14
X-Git-Tag: rel_3_1_0~147
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8ecdac668b1353dcb515b04fcb54e5b843fa57d4

2007-10-05 [wwp]	3.0.2cvs14

	* src/filtering.c
		Fix unexpected logging of quicksearches:
		debug_filtering_session flag was never reset to FALSE, causing
		matcher functions to log when called from a quicksearch
		(if a filtering session happened before).
---

diff --git a/ChangeLog b/ChangeLog
index a0914f1d1..e79a8d715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-05 [wwp]	3.0.2cvs14
+
+	* src/filtering.c
+		Fix unexpected logging of quicksearches:
+		debug_filtering_session flag was never reset to FALSE, causing
+		matcher functions to log when called from a quicksearch
+		(if a filtering session happened before).
+
 2007-10-05 [paul]	3.0.2cvs13
 
 	* src/prefs_actions.c
diff --git a/PATCHSETS b/PATCHSETS
index 1c57a617f..eb48e30b0 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2926,3 +2926,4 @@
 ( cvs diff -u -r 1.49.2.99 -r 1.49.2.100 src/procmime.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/mgutils.c;  ) > 3.0.2cvs11.patchset
 ( cvs diff -u -r 1.654.2.2980 -r 1.654.2.2981 configure.ac;  cvs diff -u -r 1.155.2.76 -r 1.155.2.77 src/Makefile.am;  ) > 3.0.2cvs12.patchset
 ( cvs diff -u -r 1.60.2.51 -r 1.60.2.52 src/prefs_actions.c;  cvs diff -u -r 1.59.2.58 -r 1.59.2.59 src/prefs_filtering.c;  cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/prefs_template.c;  ) > 3.0.2cvs13.patchset
+( cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/filtering.c;  ) > 3.0.2cvs14.patchset
diff --git a/configure.ac b/configure.ac
index acc9a70e6..0957b21d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/filtering.c b/src/filtering.c
index 6fa698dec..16362ce6f 100644
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -825,6 +825,8 @@ static gboolean filter_msginfo(GSList * filtering_list, MsgInfo * info, PrefsAcc
 gboolean filter_message_by_msginfo(GSList *flist, MsgInfo *info, PrefsAccount* ac_prefs,
 								   FilteringInvocationType context, gchar *extra_info)
 {
+	gboolean ret;
+
 	if (prefs_common.enable_filtering_debug) {
 		gchar *tmp = _("undetermined");
 
@@ -879,7 +881,10 @@ gboolean filter_message_by_msginfo(GSList *flist, MsgInfo *info, PrefsAccount* a
 		}
 	} else
 		debug_filtering_session = FALSE;
-	return filter_msginfo(flist, info, ac_prefs);
+
+	ret = filter_msginfo(flist, info, ac_prefs);
+	debug_filtering_session = FALSE;
+	return ret;
 }
 
 gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *action)