talons

commit 5d19a120a0eba16ffbf1ddbe71738cd35b899a79
parent b4a6e255e0eb47518f80d154f024a0740cc55e7f
Author: Paul Mangan <paul@claws-mail.org>
Date:   Wed, 28 Jan 2009 16:19:19 +0000

2009-01-28 [paul]	3.7.0cvs45

	* tools/filter_conv_new.pl
		move 'move' and 'delete' to end of @actions
		so that they are always final actions in the
		generated filtering rule

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
tools/filter_conv_new.pl
 | 
4
++--

4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-28 [paul]	3.7.0cvs45
+
+	* tools/filter_conv_new.pl
+		move 'move' and 'delete' to end of @actions
+		so that they are always final actions in the
+		generated filtering rule
+
 2009-01-27 [paul]	3.7.0cvs44
 
 	* src/messageview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3706,3 +3706,4 @@
 ( cvs diff -u -r 1.382.2.495 -r 1.382.2.496 src/compose.c;  cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/privacy.c;  cvs diff -u -r 1.10.2.19 -r 1.10.2.20 src/privacy.h;  ) > 3.7.0cvs42.patchset
 ( cvs diff -u -r 1.213.2.187 -r 1.213.2.188 src/folder.c;  ) > 3.7.0cvs43.patchset
 ( cvs diff -u -r 1.94.2.196 -r 1.94.2.197 src/messageview.c;  ) > 3.7.0cvs44.patchset
+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 tools/filter_conv_new.pl;  ) > 3.7.0cvs45.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/tools/filter_conv_new.pl b/tools/filter_conv_new.pl
@@ -113,8 +113,8 @@ my $xmlobj = XML::SimpleObject->new($parser->parsefile($old_filters));
 my @conditions = ('match-header','match-to-or-cc','match-any-header',
 		  'match-body-text','command-test','size','age');
 
-my @actions = ('move','copy','not-receive','delete','mark','color-label',
-	       'mark-as-read','exec','stop-eval');
+my @actions = ('copy','not-receive','mark','color-label','mark-as-read',
+	       'exec','stop-eval','move','delete');
 
 my $standard_headers = qr/^(?:Subject|From|To|Cc)$/;
 my $negative_matches = qr/^(?:not-contain|is-not|not-regex)$/;