From 9497b72a500494d13637b423282edf7fe22489f0 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Mon, 5 Mar 2007 11:05:16 +0000 Subject: [PATCH] 2007-03-05 [wwp] 2.8.0cvs20 * src/matcher_parser_parse.y Fix mismerge between cvs17 and cvs19. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/matcher_parser_parse.y | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e20e052be..0f8e48fa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-05 [wwp] 2.8.0cvs20 + + * src/matcher_parser_parse.y + Fix mismerge between cvs17 and cvs19. + 2007-03-05 [wwp] 2.8.0cvs19 * src/matcher_parser_parse.y diff --git a/PATCHSETS b/PATCHSETS index e179d2955..92277ae5a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2412,3 +2412,4 @@ ( 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 ( cvs diff -u -r 1.25.2.26 -r 1.25.2.27 src/matcher_parser_parse.y; cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/prefs_filtering_action.c; cvs diff -u -r 1.75.2.37 -r 1.75.2.38 src/matcher.c; cvs diff -u -r 1.39.2.11 -r 1.39.2.12 src/matcher.h; cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/filtering.c; cvs diff -u -r 1.21.2.11 -r 1.21.2.12 src/filtering.h; ) > 2.8.0cvs19.patchset +( cvs diff -u -r 1.25.2.27 -r 1.25.2.28 src/matcher_parser_parse.y; ) > 2.8.0cvs20.patchset diff --git a/configure.ac b/configure.ac index c8c651090..d4df2d216 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=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y index 0e1c04d63..a077b0c58 100644 --- a/src/matcher_parser_parse.y +++ b/src/matcher_parser_parse.y @@ -1179,14 +1179,14 @@ MATCHER_EXECUTE MATCHER_STRING gint action_type = 0; action_type = MATCHACTION_MARK_AS_SPAM; - action = filteringaction_new(action_type, 0, NULL, 0, 0); + action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL); } | MATCHER_MARK_AS_HAM { gint action_type = 0; action_type = MATCHACTION_MARK_AS_HAM; - action = filteringaction_new(action_type, 0, NULL, 0, 0); + action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL); } | MATCHER_FORWARD MATCHER_INTEGER MATCHER_STRING { -- 2.25.1