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 a0914f1d1f32e6ef0b7020c1535e4202c34c5cd6..e79a8d7155125cb268361befe74fc4e9eaa780ac 100644 (file)
--- 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 1c57a617fd736f28ba15832be1fdf3776b335840..eb48e30b07c54dc355c168d66631afa340e65b81 100644 (file)
--- 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 acc9a70e653c01de7d2dc58a14e61fc5c8673fac..0957b21d0b4da251f3265d7c4fac83aece54671b 100644 (file)
--- 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 6fa698dec45abe09be8ae3c6c60d7c9c76377ba1..16362ce6fde4fcca89178332e1ebd4198226cb47 100644 (file)
--- 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)