tools/multiwebsearch.pl: do whitespace substitution before passing the string to...

[claws.git] / tools / filter_conv.pl

diff --git a/tools/filter_conv.pl b/tools/filter_conv.pl
index 58ae1712f63514087365d4328b543207072aaff4..74ac353b0dc6944b50c84d936dacc426fdb968e6 100644 (file)
--- a/tools/filter_conv.pl
+++ b/tools/filter_conv.pl
@@ -25,7 +25,6 @@ chdir($ENV{ HOME } . "/.sylpheed") or die("You don't appear to have Sylpheed ins
 ###############################################################################
 
 my $normal_headers = qr/^(?:Subject|From|To|Cc)$/;
-my $extra_headers = qr/^(?:Reply-To|Sender|List-Id|X-ML-Name|X-List|X-Sequence|X-Mailer)$/;
 
 my @new_filters = ("[global]\n");
 
@@ -58,6 +57,8 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
         $mode_two,
         $action) = split(/\t/);
 
+    $value_one =~ s/\"/\\\"/g ;
+    $value_two =~ s/\"/\\\"/g ;
     $action = $action eq "m" ? "move" : "delete";
     $destination = $destination =~ m!^\#mh/! ?
                      $destination :
@@ -119,7 +120,7 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
       if ($header_one =~ m/$normal_headers/) {
         $new_filter .= $predicate_one . lc($header_one) . qq( $match_type_one "$value_one");
       }
-      elsif ($header_one =~ m/$extra_headers/) {
+      else {
         $new_filter .= $predicate_one . qq(header "$header_one" $match_type_one "$value_one");
       }
 
@@ -127,7 +128,7 @@ open(FILTERRC, "<filterrc") or die("Can't find your old filter rules ('filterrc'
         if ($header_two =~ m/$normal_headers/) {
           $new_filter .= qq( $op ) . $predicate_two . lc($header_two) . qq( $match_type_two "$value_two");
         }
-        elsif ($header_two =~ m/$extra_headers/) {
+        else {
           $new_filter .= qq( $op ) . $predicate_two . qq(header "$header_two" $match_type_two "$value_two");
         }
       }