2009-01-28 [paul] 3.7.0cvs45
authorPaul Mangan <paul@claws-mail.org>
Wed, 28 Jan 2009 16:19:19 +0000 (16:19 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 28 Jan 2009 16:19:19 +0000 (16:19 +0000)
* 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

ChangeLog
PATCHSETS
configure.ac
tools/filter_conv_new.pl

index 66f41b1..4cd2c73 100644 (file)
--- 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
index 1160628..783c705 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 3d74d14..e0161ef 100644 (file)
@@ -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=
 
index cf9d6d6..adc6278 100644 (file)
@@ -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)$/;