talons

commit f260e725eeb8542c6d9a0f79d328bde709ef9147
parent a1bd253699b28147da57a160186f8cd742b26185
Author: Paul Mangan <paul@claws-mail.org>
Date:   Fri, 16 May 2008 13:42:43 +0000

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\"

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
tools/thunderbird-filters-convertor.pl
 | 
3
++-

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -3341,3 +3341,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/tools/thunderbird-filters-convertor.pl b/tools/thunderbird-filters-convertor.pl
@@ -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") {