2008-05-16 [paul] 3.4.0cvs46
authorPaul Mangan <paul@claws-mail.org>
Fri, 16 May 2008 13:42:43 +0000 (13:42 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 16 May 2008 13:42:43 +0000 (13:42 +0000)
* tools/thunderbird-filters-convertor.pl
fix a typo
fix reading a tb rule that contains something
like that: \"Sender\"

ChangeLog
PATCHSETS
configure.ac
tools/thunderbird-filters-convertor.pl

index 25948cc..a057de7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-16 [paul]      3.4.0cvs46
+
+       * tools/thunderbird-filters-convertor.pl
+               fix a typo
+               fix reading a tb rule that contains something
+               like that: \"Sender\"
+
 2008-05-16 [paul]      3.4.0cvs45
 
        * tools/README
index 2c4b02f..509d81e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( diff -u /dev/null manual/de/account.xml;  diff -u /dev/null manual/it/account.xml;  diff -u /dev/null manual/it/ack.xml;  diff -u /dev/null manual/it/addrbook.xml;  diff -u /dev/null manual/it/claws-mail-manual.xml;  diff -u /dev/null manual/it/gpl.xml;  diff -u /dev/null manual/it/intro.xml;  diff -u /dev/null manual/it/starting.xml;  ) > 3.4.0cvs43.patchset
 ( cvs diff -u -r 1.654.2.3400 -r 1.654.2.3401 configure.ac;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/ldapupdate.c;  ) > 3.4.0cvs44.patchset
 ( cvs diff -u -r 1.30.2.28 -r 1.30.2.29 tools/README;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/csv2addressbook.pl;  ) > 3.4.0cvs45.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/thunderbird-filters-convertor.pl;  ) > 3.4.0cvs46.patchset
index bcfbb7a..40c01a6 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e9ec30c..d49cfea 100644 (file)
@@ -359,6 +359,7 @@ sub convert_filters {
                                        $cond =~ s/\) OR$//;
                                        $cond =~ s/\) AND$//;
                                        $cond =~ s/\)"$//;
+                                       $cond =~ s/\\"/"/g;
                                        my ($cpart_one, $cpart_two, $cpart_thr) = split(/,/, $cond, 3);
                                        if ($cond) {
                                                if ($cpart_one =~ m/$exact_matches/) {
@@ -375,7 +376,7 @@ sub convert_filters {
                                                        $part_one = $claws_condition = $part_three = $part_four = "";
                                                        next;
                                                } else {
-                                                       $claws_condition = "head";
+                                                       $claws_condition = "header $cpart_one";
                                                }
 
                                                if ($cpart_two eq "doesn't contain") {