From: Tristan Chabredier Date: Mon, 5 Mar 2007 09:14:17 +0000 (+0000) Subject: 2007-03-05 [wwp] 2.8.0cvs18 X-Git-Tag: rel_2_9_0~112 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d88f3b65f8ae3a523e7a3d336daaeda2cad3587c;ds=sidebyside 2007-03-05 [wwp] 2.8.0cvs18 * src/filtering.c Fix mark_as_ham filtering/processing action: spam flag was not unset. --- diff --git a/ChangeLog b/ChangeLog index 55970af6a..f4268eca0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-05 [wwp] 2.8.0cvs18 + + * src/filtering.c + Fix mark_as_ham filtering/processing action: spam flag + was not unset. + 2007-03-04 [colin] 2.8.0cvs17 * src/filtering.c diff --git a/PATCHSETS b/PATCHSETS index b86983b78..ba6b6da83 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2410,3 +2410,4 @@ ( cvs diff -u -r 1.27.2.32 -r 1.27.2.33 src/addr_compl.c; ) > 2.8.0cvs15.patchset ( cvs diff -u -r 1.179.2.157 -r 1.179.2.158 src/imap.c; ) > 2.8.0cvs16.patchset ( cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/filtering.c; cvs diff -u -r 1.75.2.36 -r 1.75.2.37 src/matcher.c; cvs diff -u -r 1.39.2.10 -r 1.39.2.11 src/matcher.h; cvs diff -u -r 1.25.2.25 -r 1.25.2.26 src/matcher_parser_parse.y; cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/prefs_filtering_action.c; ) > 2.8.0cvs17.patchset +( cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/filtering.c; ) > 2.8.0cvs18.patchset diff --git a/configure.ac b/configure.ac index 82252bdab..55a5e034d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=17 +EXTRA_VERSION=18 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/filtering.c b/src/filtering.c index ba7eca985..cc90b6449 100644 --- a/src/filtering.c +++ b/src/filtering.c @@ -337,6 +337,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info) case MATCHACTION_MARK_AS_HAM: procmsg_spam_learner_learn(info, NULL, FALSE); + procmsg_msginfo_unset_flags(info, MSG_SPAM, 0); return TRUE; case MATCHACTION_COLOR: