X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=tools%2Ffilter_conv_new.pl;h=4bae1bc03d944e347c82253ccd558959d3680ee5;hp=26f6fe0aac16211282bc672739c4e40a964cd6e7;hb=11ca74eea4a04a3815ab6c6cef0df561d6fb6bb1;hpb=7411644fd2a99b0e6021335a7c9cc1166a574997

diff --git a/tools/filter_conv_new.pl b/tools/filter_conv_new.pl
old mode 100644
new mode 100755
index 26f6fe0aa..4bae1bc03
--- a/tools/filter_conv_new.pl
+++ b/tools/filter_conv_new.pl
@@ -5,7 +5,7 @@ use XML::SimpleObject;
 
 #  * This file is free software; you can redistribute it and/or modify it
 #  * under the terms of the GNU General Public License as published by
-#  * the Free Software Foundation; either version 2 of the License, or
+#  * the Free Software Foundation; either version 3 of the License, or
 #  * (at your option) any later version.
 #  *
 #  * This program is distributed in the hope that it will be useful, but
@@ -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)$/;
@@ -179,6 +179,8 @@ foreach my $element ($xmlobj->child("filter")->children("rule")) {
 					}
 					if ($condition eq "match-any-header") {
 						$new_filter .= "headers_part ";
+					} elsif ($condition eq "match-header-content") {
+						$new_filter .= "headers_cont ";
 					} elsif ($condition eq "match-to-or-cc") {
 						$new_filter .= "to_or_cc ";
 					} elsif ($condition eq "match-body-text") {