+2006-05-15 [paul] 2.2.0cvs17
+
+ * tools/filter_conv_new.pl
+ updated for rule enabling/disabling
+ claws version >= 2.3.x required
+
2006-05-15 [cleroy] 2.2.0cvs16
* src/main.c
( diff -u /dev/null manual/pl/.cvsignore; ) > 2.2.0cvs14.patchset
( cvs diff -u -r 1.115.2.84 -r 1.115.2.85 src/main.c; ) > 2.2.0cvs15.patchset
( cvs diff -u -r 1.115.2.85 -r 1.115.2.86 src/main.c; ) > 2.2.0cvs16.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/filter_conv_new.pl; ) > 2.2.0cvs17.patchset
#!/usr/bin/perl -w
use strict;
+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
# stop-eval : stop
#
-use XML::SimpleObject;
-
my $old_config = "$ENV{HOME}/.sylpheed-2.0/filter.xml";
my $older_config = "$ENV{HOME}/.sylpheed/filter.xml";
my $old_filters;
exit;
}
+my $claws_version = `sylpheed-claws --version`;
+$claws_version =~ s/^Sylpheed-Claws version //;
+
+my ($major, $minor) = split(/\./, $claws_version);
+
+my $version_test = 0;
+if ($major > 2 || ($major == 2 && $minor >= 3)) {
+ $version_test = 1;
+}
+
my $parser = XML::Parser->new(ErrorContext => 2, Style => "Tree");
my $xmlobj = XML::SimpleObject->new($parser->parsefile($old_filters));
## rules list
foreach my $element ($xmlobj->child("filter")->children("rule")) {
- my $new_filter;
+ my $new_filter = "\n";
+ if ($element->attribute("enabled")) {
+ if ($element->attribute("enabled") eq "false") {
+ if ($version_test) {
+ $new_filter .= "disabled ";
+ } else {
+ $disabled++;
+ next; # skip disabled rules
+ }
+ } elsif ($version_test) {
+ $new_filter .= "enabled ";
+ }
+ }
if ($element->attribute("name")) {
my $name = $element->attribute("name");
$name = clean_me($name);
- $new_filter = "\nrulename \"$name\" ";
- }
- if ($element->attribute("enabled")) {
- if ($element->attribute("enabled") eq "false") {
- $disabled++;
- next; # skip disabled rules
- }
+ $new_filter .= "rulename \"$name\" ";
}
## condition list
foreach my $parent ($element->children("condition-list")) {