2006-11-08 [paul] 2.6.0cvs15
authorPaul Mangan <paul@claws-mail.org>
Wed, 8 Nov 2006 09:44:58 +0000 (09:44 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 8 Nov 2006 09:44:58 +0000 (09:44 +0000)
* tools/Makefile.am
* tools/OOo2claws-mail.pl
* tools/OOo2sylpheed.pl
* tools/README
* tools/acroread2claws-mail.pl
* tools/acroread2sylpheed.pl
* tools/kmail2claws-mail.pl
* tools/kmail2claws-mail_v2.pl
* tools/kmail2sylpheed.pl
* tools/kmail2sylpheed_v2.pl
* tools/maildir2claws-mail.pl
* tools/maildir2sylpheed.pl
* tools/nautilus2claws-mail.sh
* tools/nautilus2sylpheed.sh
* tools/outlook2claws-mail.pl
* tools/outlook2sylpheed.pl
* tools/tb2claws-mail
* tools/tb2sylpheed
* tools/tbird2claws.py
* tools/tbird2syl.py
* tools/kdeservicemenu/claws-mail-kdeservicemenu.pl
* tools/kdeservicemenu/install.sh
* tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
* tools/kdeservicemenu/template_claws-mail-attach-files.desktop
* tools/kdeservicemenu/template_claws-mail-compress-attach.desktop
* tools/kdeservicemenu/template_sylpheed-attach-files.desktop
* tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
renamed (removed, added) tools files

20 files changed:
ChangeLog
PATCHSETS
configure.ac
tools/Makefile.am
tools/OOo2claws-mail.pl [moved from tools/OOo2sylpheed.pl with 87% similarity]
tools/README
tools/acroread2claws-mail.pl [moved from tools/acroread2sylpheed.pl with 93% similarity]
tools/kdeservicemenu/claws-mail-kdeservicemenu.pl [moved from tools/kdeservicemenu/sylpheed-kdeservicemenu.pl with 93% similarity]
tools/kdeservicemenu/install.sh
tools/kdeservicemenu/template_claws-mail-attach-files.desktop [new file with mode: 0644]
tools/kdeservicemenu/template_claws-mail-compress-attach.desktop [new file with mode: 0644]
tools/kdeservicemenu/template_sylpheed-attach-files.desktop [deleted file]
tools/kdeservicemenu/template_sylpheed-compress-attach.desktop [deleted file]
tools/kmail2claws-mail.pl [moved from tools/kmail2sylpheed.pl with 72% similarity]
tools/kmail2claws-mail_v2.pl [moved from tools/kmail2sylpheed_v2.pl with 79% similarity]
tools/maildir2claws-mail.pl [moved from tools/maildir2sylpheed.pl with 87% similarity]
tools/nautilus2claws-mail.sh [moved from tools/nautilus2sylpheed.sh with 98% similarity]
tools/outlook2claws-mail.pl [moved from tools/outlook2sylpheed.pl with 92% similarity]
tools/tb2claws-mail [moved from tools/tb2sylpheed with 72% similarity]
tools/tbird2claws.py [moved from tools/tbird2syl.py with 89% similarity]

index ed3f44e..590b87b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2006-11-08 [paul]      2.6.0cvs15
+
+       * tools/Makefile.am
+       * tools/OOo2claws-mail.pl
+       * tools/OOo2sylpheed.pl
+       * tools/README
+       * tools/acroread2claws-mail.pl
+       * tools/acroread2sylpheed.pl
+       * tools/kmail2claws-mail.pl
+       * tools/kmail2claws-mail_v2.pl
+       * tools/kmail2sylpheed.pl
+       * tools/kmail2sylpheed_v2.pl
+       * tools/maildir2claws-mail.pl
+       * tools/maildir2sylpheed.pl
+       * tools/nautilus2claws-mail.sh
+       * tools/nautilus2sylpheed.sh
+       * tools/outlook2claws-mail.pl
+       * tools/outlook2sylpheed.pl
+       * tools/tb2claws-mail
+       * tools/tb2sylpheed
+       * tools/tbird2claws.py
+       * tools/tbird2syl.py
+       * tools/kdeservicemenu/claws-mail-kdeservicemenu.pl
+       * tools/kdeservicemenu/install.sh
+       * tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
+       * tools/kdeservicemenu/template_claws-mail-attach-files.desktop
+       * tools/kdeservicemenu/template_claws-mail-compress-attach.desktop
+       * tools/kdeservicemenu/template_sylpheed-attach-files.desktop
+       * tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
+               renamed (removed, added) tools files
+
 2006-11-08 [paul]      2.6.0cvs14
 
        * src/main.c
index 888c616..5674ca3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.323 -r 1.382.2.324 src/compose.c;  ) > 2.6.0cvs12.patchset
 ( cvs diff -u -r 1.155.2.46 -r 1.155.2.47 src/Makefile.am;  ) > 2.6.0cvs13.patchset
 ( cvs diff -u -r 1.115.2.111 -r 1.115.2.112 src/main.c;  cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/common/defs.h;  ) > 2.6.0cvs14.patchset
+( cvs diff -u -r 1.25.2.12 -r 1.25.2.13 tools/Makefile.am;  diff -u /dev/null tools/OOo2claws-mail.pl;  cvs diff -u -r -1.3.2.3 -r -1.3.2.4 tools/OOo2sylpheed.pl;  cvs diff -u -r 1.30.2.10 -r 1.30.2.11 tools/README;  diff -u /dev/null tools/acroread2claws-mail.pl;  cvs diff -u -r -1.1.2.5 -r -1.1.2.6 tools/acroread2sylpheed.pl;  diff -u /dev/null tools/kmail2claws-mail.pl;  diff -u /dev/null tools/kmail2claws-mail_v2.pl;  cvs diff -u -r -1.1.14.3 -r -1.1.14.4 tools/kmail2sylpheed.pl;  cvs diff -u -r -1.3.4.3 -r -1.3.4.4 tools/kmail2sylpheed_v2.pl;  diff -u /dev/null tools/maildir2claws-mail.pl;  cvs diff -u -r -1.2.2.2 -r -1.2.2.3 tools/maildir2sylpheed.pl;  diff -u /dev/null tools/nautilus2claws-mail.sh;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/nautilus2sylpheed.sh;  diff -u /dev/null tools/outlook2claws-mail.pl;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/outlook2sylpheed.pl;  diff -u /dev/null tools/tb2claws-mail;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/tb2sylpheed;  diff -u /dev/null tools/tbird2claws.py;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 tools/tbird2syl.py;  diff -u /dev/null tools/kdeservicemenu/claws-mail-kdeservicemenu.pl;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 tools/kdeservicemenu/install.sh;  cvs diff -u -r -1.5.2.4 -r -1.5.2.5 tools/kdeservicemenu/sylpheed-kdeservicemenu.pl;  diff -u /dev/null tools/kdeservicemenu/template_claws-mail-attach-files.desktop;  diff -u /dev/null tools/kdeservicemenu/template_claws-mail-compress-attach.desktop;  cvs diff -u -r -1.3.2.7 -r -1.3.2.8 tools/kdeservicemenu/template_sylpheed-attach-files.desktop;  cvs diff -u -r -1.3.2.7 -r -1.3.2.8 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop;  ) > 2.6.0cvs15.patchset
index 7336871..b20b1c9 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e4805e6..cbf6ab5 100644 (file)
@@ -1,6 +1,6 @@
 EXTRA_TOOLS = \
-       OOo2sylpheed.pl \
-       acroread2sylpheed.pl \
+       OOo2claws-mail.pl \
+       acroread2claws-mail.pl \
        calypso_convert.pl \
        convert_mbox.pl \
        eud2gc.py \
@@ -11,16 +11,16 @@ EXTRA_TOOLS = \
        gif2xface.pl \
        google_msgid.pl \
        google_search.pl \
-       kmail2sylpheed.pl \
-       kmail2sylpheed_v2.pl \
-       maildir2sylpheed.pl \
+       kmail2claws-mail.pl \
+       kmail2claws-mail_v2.pl \
+       maildir2claws-mail.pl \
        multiwebsearch.pl \
-       nautilus2sylpheed.sh \
+       nautilus2claws-mail.sh \
        outlook2sylpheed.pl \
-       sylprint.pl \
-       sylprint.rc \
-       tb2sylpheed \
-       tbird2syl.py \
+       clawsprint.pl \
+       clawsprint.rc \
+       tb2claws-mail \
+       tbird2claws.py \
        textviewer.pl \
        textviewer.sh \
        update-po \
@@ -28,15 +28,15 @@ EXTRA_TOOLS = \
        uuooffice \
        vcard2xml.py \
        kdeservicemenu/install.sh \
-       kdeservicemenu/sylpheed-kdeservicemenu.pl
+       kdeservicemenu/claws-mail-kdeservicemenu.pl
 
 EXTRA_DIST = \
        README \
        README.sylprint \
        multiwebsearch.conf \
        kdeservicemenu/README \
-       kdeservicemenu/template_sylpheed-attach-files.desktop \
-       kdeservicemenu/template_sylpheed-compress-attach.desktop \
+       kdeservicemenu/template_claws-mail-attach-files.desktop \
+       kdeservicemenu/template_claws-mail-compress-attach.desktop \
        $(EXTRA_TOOLS)
 
 MAKE_EXE = chmod u+x $(EXTRA_TOOLS)
similarity index 87%
rename from tools/OOo2sylpheed.pl
rename to tools/OOo2claws-mail.pl
index d4a11f0..0148854 100644 (file)
@@ -16,7 +16,7 @@
 #  * along with this program; if not, write to the Free Software
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# OOo2sylpheed.pl      helper script to send documents from OpenOffice.org
+# OOo2claws-mail.pl    helper script to send documents from OpenOffice.org
 #                      to Claws Mail
 
 use strict;
@@ -27,6 +27,6 @@ $ARGV =~ s/^"attachment='file:\/\///;
 $ARGV =~ s/'"$//;
 $ARGV =~ s/%20/ /g;
 exec "claws-mail --attach \"$ARGV\"";
-## change the line above to point to your sylpheed executable
+## change the line above to point to your claws-mail executable
 
 exit;
index 18c4f52..bac7196 100644 (file)
@@ -13,24 +13,24 @@ Action scripts:
 
 Addressbook conversion:
   eud2gc.py                     Convert Eudora address book to Gnomecard
-  kmail2sylpheed.pl             Import a Kmail address book (KDE2)
-  kmail2sylpheed_v2.pl          Import a Kmail address book (KDE3)
-  outlook2sylpheed.pl           Import an Outlook generated contact list
-  tb2sylpheed                   Import The Bat! address books
+  kmail2claws-mail.pl           Import a Kmail address book (KDE2)
+  kmail2claws-mail_v2.pl        Import a Kmail address book (KDE3)
+  outlook2claws-mail.pl         Import an Outlook generated contact list
+  tb2claws-mail                 Import The Bat! address books
   vcard2xml.py                 Import an Evolution vCard
 
 Mailbox conversion:
   calypso_convert.pl            Import mbox files with attachments from Calypso
   convert_mbox.pl              Import mbox files
-  maildir2sylpheed.pl          Convert a maildir mailbox to MH format
-  tbird2syl.py                 Integrate a Thunderbird folder tree into Claws
+  maildir2claws-mail.pl                Convert a maildir mailbox to MH format
+  tbird2claws.py               Integrate a Thunderbird folder tree into Claws
 
 Other tools:
-  acroread2sylpheed.pl         Send PDFs from Adobe Reader 7
+  acroread2claws-mail.pl       Send PDFs from Adobe Reader 7
   filter_conv_new.pl           Convert new-style Sylpheed filters to filtering
   filter_conv.pl                Convert old-style Sylpheed filters to filtering
-  nautilus2sylpheed.sh         Send files from Nautilus
-  OOo2sylpheed.pl               Send documents from OpenOffice.org
+  nautilus2claws-mail.sh       Send files from Nautilus
+  OOo2claws-mail.pl             Send documents from OpenOffice.org
   sylprint.pl                   Printing engine, explained in README.sylprint
   update-po                     Update the .po files named on the command line.
 
@@ -82,8 +82,8 @@ Action scripts
   WHAT IT DOES
        This is an Actions script that allows you to search
        websites for the selected text. It uses the default
-       Claws Mail browser as configured through Sylpheed
-       -Claws' GUI and specified in ~/.claws-mail/sylpheedrc,
+       Claws Mail browser as configured through Claws Mail's 
+       GUI and specified in ~/.claws-mail/sylpheedrc,
        and a configuration file called multiwebsearch.conf.
        
   CONFIGURATION
@@ -137,14 +137,14 @@ Address book conversion
 
   Contact: Jeroen Versteeg <j.m.versteeg@student.utwente.nl>
 
-* kmail2sylpheed.pl
+* kmail2claws-mail.pl
 
   WHAT IT DOES
        This perl script will convert an exported Kmail addressbook into a
        Claws Mail addressbook. If your version of Kmail is 1.37 or
        greater and/or your version of KAddressBook is 3.1beta1 or greater,
        or this script mixes up your definitions and their related data, use
-       'kmail2sylpheed_v2.pl' instead.
+       'kmail2claws-mail_v2.pl' instead.
 
   HOW TO USE IT
        (You must run claws-mail at least once before running this script.)
@@ -156,7 +156,7 @@ Address book conversion
 
        From the command line, execute the following:
  
-               perl kmail2sylpheed.pl --kmailfile=/path/to/addressbook.csv
+               perl kmail2claws-mail.pl --kmailfile=/path/to/addressbook.csv
 
        Your Kmail address book data will now be contained in Claws Mail'
        address book, under the name 'Kmail Address Book'.
@@ -164,7 +164,7 @@ Address book conversion
   Contact: Paul Mangan <claws@thewildbeast.co.uk>
     
 
-* kmail2sylpheed_v2.pl
+* kmail2claws-mail_v2.pl
 
   This script has been tested with Kmail 1.4.7 and KAddressBook 3.1beta1
 
@@ -183,7 +183,7 @@ Address book conversion
 
        From the command line, execute the following:
  
-               perl kmail2sylpheed_v2.pl --kmailfile=/path/to/addressbook.csv
+               perl kmail2claws-mail_v2.pl --kmailfile=/path/to/addressbook.csv
        
        You can also use --help to see usage instructions.
 
@@ -193,7 +193,7 @@ Address book conversion
   Contact: Paul Mangan <claws@thewildbeast.co.uk>  
 
 
-* outlook2sylpheed.pl
+* outlook2claws-mail.pl
 
   WHAT IT DOES
        This perl script converts an Outlook generated contact list into a 
@@ -209,7 +209,7 @@ Address book conversion
 
        From the command line, execute the following:
 
-               outlook2sylpheed.pl fullpathname
+               outlook2claws-mail.pl fullpathname
 
        For csv files:
        -------------
@@ -220,7 +220,7 @@ Address book conversion
 
        From the command line, execute the following:
 
-               outlook2sylpheed.pl --csv fullpathname
+               outlook2claws-mail.pl --csv fullpathname
 
   LIMITATIONS
        For text files only works with fields described above. If you have 
@@ -236,7 +236,7 @@ Address book conversion
   Contact: Ricardo Mones Lastra <mones@aic.uniovi.es>
 
 
-* tb2sylpheed
+* tb2claws-mail
 
   WHAT IT DOES
        This perl script will convert an address book exported from The Bat! 
@@ -250,7 +250,7 @@ Address book conversion
        Export The Bat! Address Book to CSV file format with all fields 
        selected to YES and then start:
 
-               tb2sylpheed --tbfile=/full/path/to/thebat/addressbook.csv
+               tb2claws-mail --tbfile=/full/path/to/thebat/addressbook.csv
  
        The Bat! addressbook data will now be contained in Claws Mail'
        addressbook, under the name 'The Bat! Address Book'.
@@ -331,7 +331,7 @@ Mailbox conversion
 
   Contact: Fred Marton <Fred.Marton@uni-bayreuth.de>
 
-* maildir2sylpheed.pl
+* maildir2claws-mail.pl
 
   WHAT IT DOES
        This perl script converts a mailbox in maildir format into
@@ -343,7 +343,7 @@ Mailbox conversion
        
        Run the script using:
         
-               perl maildir2sylpheed.pl --kmaildir=mail_folder_name
+               perl maildir2claws-mail.pl --kmaildir=mail_folder_name
                
        Start Claws Mail and right-click the toplevel mailbox, i.e
        "Mailbox (MH)", and select 'Rebuild folder tree'.
@@ -367,12 +367,12 @@ Mailbox conversion
   HOW TO USE IT
   
        The script receives two parameters from command-line:
-       <Thunderbird folder path> <Sylpheed folder path>
+       <Thunderbird folder path> <Claws Mail folder path>
 
        The best way to use it is to go to inside your Thunderbird
        root mailfolder directory and invoke it as:
 
-               <path>\python2.4 <path>\tbird2syl.py . <path to sylpheed>\Mail
+               <path>\python2.4 <path>\tbird2syl.py . <path to Claws Mail>\Mail
 
   Contact: Aleksandar Urosevic aka Urke MMI <urke@gmx.net>
 
@@ -381,14 +381,14 @@ Mailbox conversion
 Other tools
 -----------
 
-* acroread2sylpheed.pl
+* acroread2claws-mail.pl
 
   WHAT IT DOES
        This perl script enables Adobe Reader 7 to send documents to
        Claws Mail as attachments.
 
   HOW TO USE IT
-       Make sure that the script is executable (chmod +x acroread2sylpheed.pl)
+       Make sure that the script is executable (chmod +x acroread2claws-mail.pl)
        Start up Adobe Reader 7 (acroread)
        Go to /Edit/Preferences/SendMail
        Select any email client except 'System Mail (mail)'
@@ -406,7 +406,7 @@ Other tools
   WHAT IT DOES
        This perl script provides easy conversion of your filtering rules from
        sylpheed's new filter system (>= 0.9.99) to the filtering system used in
-       claws-mail. (Disabled rules are ignored)
+       Claws Mail.
        It reads '~/.sylpheed-2.0/filter.xml' or '~/.sylpheed/filter.xml' and
        writes '~/[CLAWS CONFIG DIR]/matcherrc'
   
@@ -429,7 +429,7 @@ Other tools
   WHAT IT DOES
        This perl script provides easy conversion of your filtering rules
        from sylpheed's old filter system (< 0.9.99) to the filtering system
-       used in claws-mail.
+       used in Claws Mail.
        It reads '~/.sylpheed/filterrc' and writes '~/.claws-mail/matcherrc'
   
   HOW TO USE IT
@@ -443,7 +443,7 @@ Other tools
   Contact: Paul Mangan <claws@thewildbeast.co.uk>
   
 
-* nautilus2sylpheed.sh
+* nautilus2claws-mail.sh
 
   WHAT IT DOES
        This script will recursively attach a number of selected 
@@ -452,12 +452,12 @@ Other tools
   HOW TO USE IT
        Copy the script to $HOME/.gnome2/nautilus-scripts, chmod u+x, 
        and restart nautilus (killall -9 nautilus). You will now have 
-       a right-click menu item: '/Scripts/nautilus2sylpheed.sh'
+       a right-click menu item: '/Scripts/nautilus2claws-mail.sh'
        
   Contact: Reza Pakdel <hrpakdel@cpsc.ucalgary.ca>
 
 
-* OOo2sylpheed.pl
+* OOo2claws-mail.pl
 
   WHAT IT DOES
        This perl script enables OpenOffice.org to send documents to
@@ -477,7 +477,7 @@ Other tools
        Go to 'Tools/Options/OpenOffice.org/External Programs'
        Select either ''Mozilla 1.x (Option 1)', or 
        'Netscape 6.x - 7.0 (Option 1)' from the 'Program' selection
-       Enter the path to OOo2sylpheed.pl in the 'Path' box
+       Enter the path to OOo2claws-mail.pl in the 'Path' box
        or select it by clicking on the '...' button.
     
        You can then use 'File/Send/Document as email' to launch
@@ -488,7 +488,7 @@ Other tools
     --------------------------
        Start up OpenOffice.org.
        Go to 'Tools/Options/OpenOffice.org/External Programs'
-       Enter the path to OOo2sylpheed.pl in the 'Program' box
+       Enter the path to OOo2claws-mail.pl in the 'Program' box
        or select it by clicking on the '...' button.
 
 
@@ -543,7 +543,7 @@ Extra tools
        In filename.xface will be the X-Face header ready to use.
        You can add a custom header in Claws Mail through Configuration->
        Preferences per account, "Send" tab, check "Add user-defined header"
-       then "Edit..." if you want to add it via Sylpheed -Claws interface, or do
+       then "Edit..." if you want to add it via the Claws Mail interface, or do
 
                echo "0:" `cat filename.xface` > ~/.claws-mail/customheaderrc
 
similarity index 93%
rename from tools/acroread2sylpheed.pl
rename to tools/acroread2claws-mail.pl
index 4a472b8..c063aa8 100644 (file)
@@ -16,8 +16,8 @@
 #  * along with this program; if not, write to the Free Software
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# acroread2sylpheed.pl helper script to send documents from
-#                      Adobe Reader 7 to claws-mail
+# acroread2claws-mail.pl       helper script to send documents from
+#                              Adobe Reader 7 to claws-mail
 
 use strict;
 
 
 unless ($ARGV[0]) { exit; }
 
-my $sylpheed = "claws-mail --compose --attach";
+my $claws = "claws-mail --compose --attach";
 my $prefix = "/tmp/archive.";
 my $command = find_command($ARGV[0]);
 my ($sel,$att) = split_parts();
 
 if ($ARGV[0] eq "gz" || $ARGV[0] eq "bz2") {
-       exec "$sel$sylpheed $att";
+       exec "$sel$claws $att";
 } elsif ($ARGV[0] eq "attachfile") {
-       exec "$sylpheed $sel";
+       exec "$claws $sel";
 } else {
        exec "$command $prefix$ARGV[0] $sel;"
-           ."$sylpheed $prefix$ARGV[0]";
+           ."$claws $prefix$ARGV[0]";
 }
 
 exit;
index 24dcc08..dfbc0ae 100644 (file)
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-PERL_SCRIPT="sylpheed-kdeservicemenu.pl"
-DESKTOP_TEMPLATE_ONE="template_sylpheed-attach-files.desktop"
-DESKTOP_ONE="sylpheed-attach-files.desktop"
-DESKTOP_TEMPLATE_TWO="template_sylpheed-compress-attach.desktop"
-DESKTOP_TWO="sylpheed-compress-attach.desktop"
+PERL_SCRIPT="claws-mail-kdeservicemenu.pl"
+DESKTOP_TEMPLATE_ONE="template_claws-mail-attach-files.desktop"
+DESKTOP_ONE="claws-mail-attach-files.desktop"
+DESKTOP_TEMPLATE_TWO="template_claws-mail-compress-attach.desktop"
+DESKTOP_TWO="claws-mail-compress-attach.desktop"
 SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
 
 function check_environ {
diff --git a/tools/kdeservicemenu/template_claws-mail-attach-files.desktop b/tools/kdeservicemenu/template_claws-mail-attach-files.desktop
new file mode 100644 (file)
index 0000000..e1c29e6
--- /dev/null
@@ -0,0 +1,24 @@
+[Desktop Action AttachFiles]
+Exec=SCRIPT_PATH attachfile %U
+Icon=claws-mail
+Name=Attach File(s)
+
+[Desktop Action BZipAndAttach]
+Exec=SCRIPT_PATH bz2 %U
+Icon=claws-mail
+Name=Attach as BZip File(s)
+
+[Desktop Action GZipAndAttach]
+Exec=SCRIPT_PATH gz %U
+Icon=claws-mail
+Name=Attach as GZip File(s)
+
+[Desktop Entry]
+Actions=AttachFiles;GZipAndAttach;BZipAndAttach;
+Comment=kde service menu for compressing and attaching files to Claws Mail
+Encoding=UTF8
+Icon=
+Name=Claws Mail compress and attach files
+ServiceTypes=all/allfiles
+X-KDE-Priority=TopLevel
+X-KDE-Submenu=Claws Mail
diff --git a/tools/kdeservicemenu/template_claws-mail-compress-attach.desktop b/tools/kdeservicemenu/template_claws-mail-compress-attach.desktop
new file mode 100644 (file)
index 0000000..a47faa4
--- /dev/null
@@ -0,0 +1,29 @@
+[Desktop Action TarAndAttach]
+Exec=SCRIPT_PATH tar %U
+Icon=claws-mail
+Name=Attach as Tar Archive
+
+[Desktop Action TarBzipAndAttach]
+Exec=SCRIPT_PATH tar.bz2 %U
+Icon=claws-mail
+Name=Attach as Bzipped Tar Archive
+
+[Desktop Action TarGzipAndAttach]
+Exec=SCRIPT_PATH tar.gz %U
+Icon=claws-mail
+Name=Attach as Gzipped Tar Archive
+
+[Desktop Action ZipAndAttach]
+Exec=SCRIPT_PATH zip %U
+Icon=claws-mail
+Name=Attach as Zip Archive
+
+[Desktop Entry]
+Actions=TarAndAttach;TarBzipAndAttach;TarGzipAndAttach;ZipAndAttach;
+Comment=kde service menu for compressing and attaching files/dirs to Claws Mail
+Encoding=UTF8
+Icon=
+Name=Claws Mail compress and attach files/dirs
+ServiceTypes=all/all
+X-KDE-Priority=TopLevel
+X-KDE-Submenu=Claws Mail
diff --git a/tools/kdeservicemenu/template_sylpheed-attach-files.desktop b/tools/kdeservicemenu/template_sylpheed-attach-files.desktop
deleted file mode 100644 (file)
index 354a8c5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-[Desktop Entry]
-Actions=AttachFiles;GZipAndAttach;BZipAndAttach;
-Encoding=UTF8
-Name=Sylpheed compress and attach files
-Comment=kde service menu for compressing and attaching files to Sylpheed
-X-KDE-Submenu=Claws Mail
-X-KDE-Priority=TopLevel
-ServiceTypes=all/allfiles
-
-[Desktop Action AttachFiles]
-Name=Attach File(s)
-Name[de]=Datei(en) anhängen
-Name[es]=Adjuntar fichero(s)
-Name[fr]=Joindre le(s) Fichier(s)
-Name[it]=Allega file
-Name[pt_BR]=Anexar arquivo(s)
-Name[sk]=Pripoji» súbor(y)
-Icon=claws-mail
-Exec=SCRIPT_PATH attachfile %U
-
-[Desktop Action GZipAndAttach]
-Name=Attach as GZip File(s)
-Name[de]=Als GZip-Datei(en) anhängen
-Name[es]=Adjuntar como fichero(s) comprimido(s) con GZip
-Name[fr]=Joindre comme Fichier(s) GZip
-Name[it]=Allega come file .gz
-Name[pt_BR]=Anexar como arquivo(s) GZip
-Name[sk]=Pripoji» ako súbor(y) GZip
-Icon=claws-mail
-Exec=SCRIPT_PATH gz %U
-
-[Desktop Action BZipAndAttach]
-Name=Attach as BZip File(s)
-Name[de]=Als BZip-Datei(en) anhängen
-Name[es]=Adjuntar como fichero(s) comprimido(s) con BZip
-Name[fr]=Joindre comme Fichier(s) Bzip
-Name[it]=Allega come file .bz
-Name[pt_BR]=Anexar como arquivo(s) BZip
-Name[sk]=Pripoji» ako súbor(y) Bzip
-Icon=claws-mail
-Exec=SCRIPT_PATH bz2 %U
diff --git a/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop b/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
deleted file mode 100644 (file)
index 52bfd5d..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[Desktop Entry]
-Actions=TarAndAttach;TarBzipAndAttach;TarGzipAndAttach;ZipAndAttach;
-Encoding=UTF8
-Name=Sylpheed compress and attach files/dirs
-Comment=kde service menu for compressing and attaching files/dirs to Sylpheed
-X-KDE-Submenu=Claws Mail
-X-KDE-Priority=TopLevel
-ServiceTypes=all/all
-
-[Desktop Action TarAndAttach]
-Name=Attach as Tar Archive
-Name[de]=Als Tar-Archiv anhängen
-Name[es]=Adjuntar como archivo Tar
-Name[fr]=Joindre comme Archive Tar
-Name[it]=Allega come file tar
-Name[pt_BR]=Anexar como arquivo Tar
-Name[sk]=Pripoji» ako archív Tar
-Icon=claws-mail
-Exec=SCRIPT_PATH tar %U
-
-[Desktop Action TarBzipAndAttach]
-Name=Attach as Bzipped Tar Archive
-Name[de]=Als BZip Tar-Archiv anhängen
-Name[es]=Adjuntar como archivo Tar comprimido con BZip
-Name[fr]=Joindre comme Archive Tar Bzippée
-Name[it]=Allega come file tar.bz
-Name[pt_BR]=Anexar como arquivo Tar compactado com BZip
-Name[sk]=Pripoji» ako Bzip-om komprimovaný archív Tar
-Icon=claws-mail
-Exec=SCRIPT_PATH tar.bz2 %U
-
-[Desktop Action TarGzipAndAttach]
-Name=Attach as Gzipped Tar Archive
-Name[de]=Als Gzip Tar-Archiv anhängen
-Name[es]=Adjuntar como archivo Tar comprimido con GZip
-Name[fr]=Joindre comme Archive Tar Gzippée
-Name[it]=Allega come file tar.gz
-Name[pt_BR]=Anexar como arquivo Tar compactado com GZip
-Name[sk]=Pripoji» ako Gzip-om komprimovaný archív Tar
-Icon=claws-mail
-Exec=SCRIPT_PATH tar.gz %U
-
-[Desktop Action ZipAndAttach]
-Name=Attach as Zip Archive
-Name[de]=Als Zip-Archiv anhängen
-Name[es]=Adjuntar como archivo comprimido Zip
-Name[fr]=Joindre comme Archive Zip
-Name[it]=Allega come file zip
-Name[pt_BR]=Anexar como arquivo Zip
-Name[sk]=Pripoji» ako archív Zip
-Icon=claws-mail
-Exec=SCRIPT_PATH zip %U
similarity index 72%
rename from tools/kmail2sylpheed.pl
rename to tools/kmail2claws-mail.pl
index 77dab18..1301b14 100644 (file)
@@ -16,9 +16,9 @@
 #  * along with this program; if not, write to the Free Software
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-## script name : kmail2sylpheed.pl
+## script name : kmail2claws-mail.pl
 
-## script purpose : convert a Kmail addressbook into a Sylpheed addressbook
+## script purpose : convert a Kmail addressbook into a Claws Mail addressbook
 
 use Getopt::Long;
 
@@ -28,14 +28,14 @@ GetOptions("kmailfile=s" => \$kmailfile);
 
 $time = time;
 
-$sylph_addr = "<?xml version=\"1.0\" encoding=\"US-ASCII\" ?>\n";
-$sylph_addr .= "<address-book name=\"Kmail Address Book\" >\n";
+$claws_addr = "<?xml version=\"1.0\" encoding=\"US-ASCII\" ?>\n";
+$claws_addr .= "<address-book name=\"Kmail Address Book\" >\n";
 
 chdir;
 
-opendir(SYLPHEED, ".claws-mail") || die("Can't open .claws-mail directory\n");
-       push(@cached,(readdir(SYLPHEED)));
-closedir(SYLPHEED);
+opendir(CLAWS, ".claws-mail") || die("Can't open .claws-mail directory\n");
+       push(@cached,(readdir(CLAWS)));
+closedir(CLAWS);
 
 foreach $cached (@cached) {
        if ($cached =~ m/^addrbook/ && $cached =~ m/[0-9].xml$/) {
@@ -67,12 +67,12 @@ foreach $kmailline (@kmaillines) {
                $kmaildata =~ s/</&lt;/g;
                $kmaildata =~ s/>/&gt;/g;
        }
-    $sylph_addr .= "  <person uid=\"$time\" first-name=\"$kmaildata[0]\""
+    $claws_addr .= "  <person uid=\"$time\" first-name=\"$kmaildata[0]\""
                 ." last-name=\"$kmaildata[1]\" nick-name=\"$kmaildata[7]\""
                 ." cn=\"$kmaildata[0] $kmaildata[1]\" >\n"
                 ."    <address-list>\n";
     $time++;
-    $sylph_addr .= "      <address uid=\"$time\" alias=\"\" email=\"$kmaildata[6]\""
+    $claws_addr .= "      <address uid=\"$time\" alias=\"\" email=\"$kmaildata[6]\""
                ." remarks=\"$kmaildata[8]\" />\n"
                ."    </address-list>\n";
     if ($kmaildata[13] ne "" || $kmaildata[9] ne "" || $kmaildata[21] ne "" ||
@@ -82,112 +82,112 @@ foreach $kmailline (@kmaillines) {
        $kmaildata[3] ne "" || $kmaildata[14] ne "" || $kmaildata[22] ne "" ||
        $kmaildata[17] ne "" || $kmaildata[20] ne "" || $kmaildata[15] ne "" ||
        $kmaildata[23] ne "" || $kmaildata[18] ne "") {
-       $sylph_addr .= "    <attribute-list>\n";
+       $claws_addr .= "    <attribute-list>\n";
 
        if ($kmaildata[3] ne "" || $kmaildata[2] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Full Name\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Full Name\" >"
                        ."$kmaildata[3] $kmaildata[0] $kmaildata[2] $kmaildata[1]</attribute>\n";
        }
        if ($kmaildata[15] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Street Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Street Address\" >"
                        ."$kmaildata[15]</attribute>\n";
        }
        if ($kmaildata[16] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home City Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home City Address\" >"
                        ."$kmaildata[16]</attribute>\n";
        }
        if ($kmaildata[17] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home State Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home State Address\" >"
                        ."$kmaildata[17]</attribute>\n";
        }
        if ($kmaildata[18] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Zip Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Zip Address\" >"
                        ."$kmaildata[18]</attribute>\n";
        }
        if ($kmaildata[19] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Country Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Country Address\" >"
                        ."$kmaildata[19]</attribute>\n";
        }
        if ($kmaildata[10] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Phone\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Phone\" >"
                        ."$kmaildata[10]</attribute>\n";
        }
        if ($kmaildata[12] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Fax\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Fax\" >"
                        ."$kmaildata[12]</attribute>\n";
        }
        if ($kmaildata[11] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Mobile Phone\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Mobile Phone\" >"
                        ."$kmaildata[11]</attribute>\n";
        }
        if ($kmaildata[14] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Pager\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Pager\" >"
                        ."$kmaildata[14]</attribute>\n";
        }
        if ($kmaildata[5] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Company\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Company\" >"
                        ."$kmaildata[5]</attribute>\n";
        }
        if ($kmaildata[4] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Job Title\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Job Title\" >"
                        ."$kmaildata[4]</attribute>\n";
        }
        if ($kmaildata[20] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Street Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Street Address\" >"
                        ."$kmaildata[20]</attribute>\n";
        }
        if ($kmaildata[21] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business City Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business City Address\" >"
                        ."$kmaildata[21]</attribute>\n";
        }
        if ($kmaildata[22] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business State Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business State Address\" >"
                        ."$kmaildata[22]</attribute>\n";
        }
        if ($kmaildata[23] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Zip Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Zip Address\" >"
                        ."$kmaildata[23]</attribute>\n";
        }
        if ($kmaildata[24] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Country Address\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Country Address\" >"
                        ."$kmaildata[24]</attribute>\n";
        }
        if ($kmaildata[9] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Phone\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Phone\" >"
                        ."$kmaildata[9]</attribute>\n";
        }
        if ($kmaildata[13] ne "") {
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Fax\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Fax\" >"
                        ."$kmaildata[13]</attribute>\n";
        }
-       $sylph_addr .= "    </attribute-list>\n";
+       $claws_addr .= "    </attribute-list>\n";
     }
-    $sylph_addr .=  "  </person>\n";
+    $claws_addr .=  "  </person>\n";
     $time++;
 }
-$sylph_addr .= "</address-book>\n";
+$claws_addr .= "</address-book>\n";
 
 open (NEWADDR, ">.claws-mail/$new_addrbk");
-print NEWADDR $sylph_addr;
+print NEWADDR $claws_addr;
 close NEWADDR;
 
 open (ADDRIN, "<.claws-mail/addrbook--index.xml") || die("can't open addrbook--index.xml");
similarity index 79%
rename from tools/kmail2sylpheed_v2.pl
rename to tools/kmail2claws-mail_v2.pl
index a5635ed..bbd7c05 100644 (file)
 #  * along with this program; if not, write to the Free Software
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-## script name : kmail2sylpheed_v2.pl
+## script name : kmail2claws-mail_v2.pl
 
 ## script purpose : convert an exported Kmail addressbook csv file 
-## into a Sylpheed addressbook
+## into a Claws Mail addressbook
 
 ## tested with Kmail 1.4.7 and KAddressBook 3.1beta1
 
@@ -36,21 +36,21 @@ if ($kmailfile eq "" || $iNeedHelp) {
                print "No filename given\n";
        }
        print "Use the following format:\n";
-       print "\tkmail2sylpheed_v2.pl --kmailfile=/path/to/addressbook.csv\n";
+       print "\tkmail2claws-mail_v2.pl --kmailfile=/path/to/addressbook.csv\n";
        exit;
 }
 
-$sylph_dir  = ".claws-mail";
-$addr_index = "$sylph_dir/addrbook--index.xml";
+$claws_dir  = ".claws-mail";
+$addr_index = "$claws_dir/addrbook--index.xml";
 $new_addressbook = "Kmail address book";
  
 $time = time;
 
 chdir;
 
-opendir(SYLPHEED, $sylph_dir) || die("Can't open $sylph_dir directory\n");
-       push(@cached,(readdir(SYLPHEED)));
-closedir(SYLPHEED);
+opendir(CLAWS, $claws_dir) || die("Can't open $claws_dir directory\n");
+       push(@cached,(readdir(CLAWS)));
+closedir(CLAWS);
 
 foreach $cached (@cached) {
        if ($cached =~ m/^addrbook/ && $cached =~ m/[0-9].xml$/) {
@@ -75,8 +75,8 @@ $defs = shift(@kmaillines);
 
 (@kmaildefs) = split(/,/,$defs);
 
-$sylph_addr = "<?xml version=\"1.0\" encoding=\"US-ASCII\" ?>\n";
-$sylph_addr .= "<address-book name=\"Kmail address book\" >\n";
+$claws_addr = "<?xml version=\"1.0\" encoding=\"US-ASCII\" ?>\n";
+$claws_addr .= "<address-book name=\"Kmail address book\" >\n";
 
 foreach $kmailline (@kmaillines) {
     (@kmaildata) = split(/,/,$kmailline); 
@@ -91,12 +91,12 @@ foreach $kmailline (@kmaillines) {
                $kmaildata =~ s/\\n/, /g;
                chomp $kmaildata;
        }
-    $sylph_addr .= "  <person uid=\"$time\" first-name=\"$kmaildata[2]\""
+    $claws_addr .= "  <person uid=\"$time\" first-name=\"$kmaildata[2]\""
                 ." last-name=\"$kmaildata[1]\" nick-name=\"$kmaildata[6]\""
                 ." cn=\"$kmaildata[2] $kmaildata[1]\" >\n"
                 ."    <address-list>\n";
     $time++;
-    $sylph_addr .= "      <address uid=\"$time\" alias=\"\" email=\"$kmaildata[28]\""
+    $claws_addr .= "      <address uid=\"$time\" alias=\"\" email=\"$kmaildata[28]\""
                ." remarks=\"$kmaildata[33]\" />\n"
                ."    </address-list>\n";
 
@@ -106,7 +106,7 @@ foreach $kmailline (@kmaillines) {
                }
        }
        if ($def_exist[0]) {
-               $sylph_addr .= "    <attribute-list>\n";
+               $claws_addr .= "    <attribute-list>\n";
        }
        foreach $def_exist (@def_exist) {
                $kmaildefs[$def_exist] =~ s/^"//;
@@ -114,21 +114,21 @@ foreach $kmailline (@kmaillines) {
                $kmaildefs[$def_exist] =~ s/'/&apos;/g;
                
                $time++;
-               $sylph_addr .= "      <attribute uid=\"$time\" name=\"$kmaildefs[$def_exist]\" >"
+               $claws_addr .= "      <attribute uid=\"$time\" name=\"$kmaildefs[$def_exist]\" >"
                        ."$kmaildata[$def_exist]</attribute>\n";
                $attribs = 1;
        }
        if ($attribs == 1) {
-               $sylph_addr .= "    </attribute-list>\n";
+               $claws_addr .= "    </attribute-list>\n";
        }
-    $sylph_addr .=  "  </person>\n";
+    $claws_addr .=  "  </person>\n";
     $time++;
     $count++;
 }
-$sylph_addr .= "</address-book>\n";
+$claws_addr .= "</address-book>\n";
 
-open (NEWADDR, ">$sylph_dir/$new_addrbk");
-print NEWADDR $sylph_addr;
+open (NEWADDR, ">$claws_dir/$new_addrbk");
+print NEWADDR $claws_addr;
 close NEWADDR;
 
 open (ADDRIN, "<$addr_index") 
similarity index 87%
rename from tools/maildir2sylpheed.pl
rename to tools/maildir2claws-mail.pl
index 59bd8f1..a032cd9 100644 (file)
@@ -22,9 +22,9 @@
 
 ## script name : maildir2sylpheed.pl
 
-## script purpose : convert a Kmail mailbox into a Sylpheed mailbox
+## script purpose : convert a Kmail mailbox into a Claws Mail mailbox
 
-## USAGE: maildir2sylpheed.pl --kmaildir=Mail
+## USAGE: maildir2claws-mail.pl --kmaildir=Mail
 
 ## tested with Kmail version 1.5.2
 
@@ -40,8 +40,8 @@ my $PRETEND = '';
 # print debug info if set
 my $DEBUG = '';
 
-my $sylpheed_tmpdir = "$ENV{HOME}/sylpheed_tmp";
-my $kmail_olddir    = "$ENV{HOME}/kmail_junk";
+my $claws_tmpdir = "$ENV{HOME}/claws_tmp";
+my $kmail_olddir = "$ENV{HOME}/kmail_junk";
 
 GetOptions("kmaildir=s" => \$kmaildir,
           "help"       => \$iNeedHelp,
@@ -53,7 +53,7 @@ if ($kmaildir eq "" || $iNeedHelp) {
                print "No directory name given\n";
        }
        print "Use the following format:\n";
-       print "\tmaildir2sylpheed.pl --kmaildir=mail_folder_name\n\n";
+       print "\tmaildir2claws-mail.pl --kmaildir=mail_folder_name\n\n";
        print "For example: 'Mail'\n";
        exit;
 }
@@ -73,12 +73,12 @@ if (-d $MAIL_dir) {
 }
 
 unless ($PRETEND) {
-       mkdir("$sylpheed_tmpdir", 0755);
+       mkdir("$claws_tmpdir", 0755);
        system("mv $kmaildir $kmail_olddir");
-       system("mv $sylpheed_tmpdir $ENV{HOME}/Mail");
+       system("mv $claws_tmpdir $ENV{HOME}/Mail");
 
        print "\n\nSucessfully converted mailbox \"$MAIL_dir\"\n";
-       print "Start Sylpheed and right-click \"Mailbox (MH)\" and ";
+       print "Start claws-mail and right-click \"Mailbox (MH)\" and ";
        print "select \"Rebuild folder tree\"\n";
        print "You may also need to run \"/File/Folder/Check for ";
        print "new messages in all folders\"\n\n";
@@ -114,7 +114,7 @@ sub process_dir() {
                $tmpdir =~ s/\.directory//g;
                $tmpdir =~ s/\.//g;
                
-               my $newdir = "$sylpheed_tmpdir/$tmpdir";
+               my $newdir = "$claws_tmpdir/$tmpdir";
                $DEBUG && print qq{\n>>> -e "$newdir" || mkdir("$newdir")};
                $PRETEND || -e "$newdir" || mkdir("$newdir");
        }
@@ -145,7 +145,7 @@ sub process_file {
                }
 
                $nfile = join("/", @spl_str);
-               $nfile =~ s|$kmaildir|$sylpheed_tmpdir/|;
+               $nfile =~ s|$kmaildir|$claws_tmpdir/|;
        }
 
        if (-e "$file" && $nfile ne "") {
similarity index 98%
rename from tools/nautilus2sylpheed.sh
rename to tools/nautilus2claws-mail.sh
index 4202dce..35deb1c 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# nautilus2sylpheed.sh
+# nautilus2claws-mail.sh
 # Copyright 2004 Reza Pakdel <hrpakdel@cpsc.ucalgary.ca>
 
 # This program is free software; you can redistribute it and/or
similarity index 92%
rename from tools/outlook2sylpheed.pl
rename to tools/outlook2claws-mail.pl
index d7b0b82..9248e27 100644 (file)
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # outlook2sylpheed.pl -- perl script to convert an Outlook generated 
-#                       contact list into a Sylpheed XML address book.
+#                       contact list into a Claws Mail XML address book.
 # 
 # This script is based on:
 #      out2syl.sh by Rafael Lossurdo <mugas@via-rs.net>
-#      kmail2sylpheed.pl by Paul Mangan <claws@thewildbeast.co.uk>
+#      kmail2claws-mail.pl by Paul Mangan <claws@thewildbeast.co.uk>
 #
 # See README file for details and usage.
 #
@@ -41,16 +41,16 @@ else {
        $outl_file = $ARGV[0];
 }
 # some init
-$sylconf = ".claws-mail";
-$indexname = "$sylconf/addrbook--index.xml";
+$clawsconf = ".claws-mail";
+$indexname = "$clawsconf/addrbook--index.xml";
 
 # the next is mostly Paul's code
 $time = time;
 
 chdir;
-opendir(SYLPHEED, $sylconf) || die("Error: can't open $sylconf directory\n");
-       push(@cached,(readdir(SYLPHEED)));
-closedir(SYLPHEED);
+opendir(CLAWS, $clawsconf) || die("Error: can't open $clawsconf directory\n");
+       push(@cached,(readdir(CLAWS)));
+closedir(CLAWS);
 
 foreach $cached (@cached) {
        if ($cached =~ m/^addrbook/ && $cached =~ m/[0-9].xml$/) {
@@ -189,8 +189,8 @@ if ($do_csv) {
        die "Error: unknown csv file format\n" 
                unless ($#headerline == $nboffields);
 }
-open(NEWB, '>', "$sylconf/$new_book") 
-       or die "Error: can't open $sylconf/$new_book for writting\n";
+open(NEWB, '>', "$clawsconf/$new_book") 
+       or die "Error: can't open $clawsconf/$new_book for writting\n";
 if ($do_csv) { process_csv(); }
 else { process_text(); }
 
similarity index 72%
rename from tools/tb2sylpheed
rename to tools/tb2claws-mail
index d139a9a..106877e 100644 (file)
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
-# Script name : tb2sylpheed
+# Script name : tb2claws-mail
 # Script version: 1.0.2
-# Script based on : script kmail2sylpheed.pl
-# Script purpose : convert The Bat! addressbook into Sylpheed addressbook
+# Script based on : script kmail2claws-mail.pl
+# Script purpose : convert The Bat! addressbook into Claws Mail addressbook
 # Author : Aleksandar Urosevic aka Urke MMI <urke@gmx.net>
 # Licence : GPL
 #
@@ -11,7 +11,7 @@
 #
 # Usage: Export The Bat! Address Book to CSV file format
 #        with all fields selected to YES and then start:
-#        tb2sylpheed --tbfile=/full/path/to/thebat/addressbook.csv
+#        tb2claws-mail --tbfile=/full/path/to/thebat/addressbook.csv
 #
 # Change Log:
 #
@@ -42,10 +42,10 @@ $total_addresses = 0;
 
 chdir;
 
-# check is Sylpheed instrtalled
-opendir(SYLPHEED, ".claws-mail") || die("Can't open Claws Mail directory! Conversion abroted\n");
-    push(@cached, (readdir(SYLPHEED)));
-closedir(SYLPHEED);
+# check is Claws-Mail instrtalled
+opendir(CLAWS, ".claws-mail") || die("Can't open Claws Mail directory! Conversion abroted\n");
+    push(@cached, (readdir(CLAWS)));
+closedir(CLAWS);
 
 # get last existing addressbook filename
 # to set filename for newest addressbook
@@ -74,8 +74,8 @@ $dross = shift(@tblines);
 
 # set time mark and header of addressbook
 $time = time;
-$sylph_addr = "<?xml version=\"1.0\" encoding=\"ISO-8859-2\" ?>\n";
-$sylph_addr .= "<address-book name=\"The Bat! Address Book\" >\n";
+$claws_addr = "<?xml version=\"1.0\" encoding=\"ISO-8859-2\" ?>\n";
+$claws_addr .= "<address-book name=\"The Bat! Address Book\" >\n";
 
 # create addressbook entry from The Bat! addressbook
 foreach $tbline (@tblines) {
@@ -95,12 +95,12 @@ foreach $tbline (@tblines) {
        $tbdata =~ s/\ {2,}/ /g;
     }
     # set addressbook field values
-    $sylph_addr .= "  <person uid=\"$time\" first-name=\"$tbdata[1]\""
+    $claws_addr .= "  <person uid=\"$time\" first-name=\"$tbdata[1]\""
                ." last-name=\"$tbdata[2]\" nick-name=\"$tbdata[5]\""
                ." cn=\"$tbdata[0]\" >\n"
                ."    <address-list>\n";
     $time++;
-    $sylph_addr .= "      <address uid=\"$time\" alias=\"$tbdata[5]\" email=\"$tbdata[4]\""
+    $claws_addr .= "      <address uid=\"$time\" alias=\"$tbdata[5]\" email=\"$tbdata[4]\""
                ." remarks=\"\" />\n"
                ."    </address-list>\n";
 
@@ -113,7 +113,7 @@ foreach $tbline (@tblines) {
     }
 
     if ($check > 0) {
-    $sylph_addr .= "    <attribute-list>\n";
+    $claws_addr .= "    <attribute-list>\n";
        if ($tbdata[1] ne "" || $tbdata[2] ne "") {
            $time++;
            if($tbdata[29] ne "" && $tbdata[1] ne "") { $full_name = "$tbdata[29] $tbdata[1]"; } else { $full_name = "$tbdata[1]"; }
@@ -121,138 +121,138 @@ foreach $tbline (@tblines) {
            if($tbdata[2] ne "") { $full_name .= " $tbdata[2]"; }
            if($tbdata[28] ne "") { $full_name .= " $tbdata[28]"; }
                
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Full Name\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Full Name\" >"
                        ."$full_name</attribute>\n";
        }
        if ($tbdata[15] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Street Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Street Address\" >"
                        ."$tbdata[15]</attribute>\n";
        }
        if ($tbdata[16] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home City Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home City Address\" >"
                        ."$tbdata[16]</attribute>\n";
        }
        if ($tbdata[17] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home State Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home State Address\" >"
                        ."$tbdata[17]</attribute>\n";
        }
        if ($tbdata[18] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Zip Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Zip Address\" >"
                        ."$tbdata[18]</attribute>\n";
        }
        if ($tbdata[19] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Country Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Country Address\" >"
                        ."$tbdata[19]</attribute>\n";
        }
        if ($tbdata[9] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Phone\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Phone\" >"
                        ."$tbdata[9]</attribute>\n";
        }
        if ($tbdata[10] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Home Fax\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Home Fax\" >"
                        ."$tbdata[10]</attribute>\n";
        }
        if ($tbdata[11] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Mobile Phone\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Mobile Phone\" >"
                        ."$tbdata[11]</attribute>\n";
        }
        if ($tbdata[30] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Personal Homepage\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Personal Homepage\" >"
                        ."$tbdata[30]</attribute>\n";
        }
        if ($tbdata[14] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Pager\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Pager\" >"
                        ."$tbdata[14]</attribute>\n";
        }
        if ($tbdata[7] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Bussines Company\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Bussines Company\" >"
                        ."$tbdata[7]</attribute>\n";
        }
        if ($tbdata[8] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Bussines Job Title\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Bussines Job Title\" >"
                        ."$tbdata[8]</attribute>\n";
        }
        if ($tbdata[20] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Department\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Department\" >"
                        ."$tbdata[20]</attribute>\n";
        }
        if ($tbdata[21] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Office\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Office\" >"
                        ."$tbdata[21]</attribute>\n";
        }
        if ($tbdata[22] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Street Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Street Address\" >"
                        ."$tbdata[22]</attribute>\n";
        }
        if ($tbdata[23] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business City Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business City Address\" >"
                        ."$tbdata[23]</attribute>\n";
        }
        if ($tbdata[24] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business State Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business State Address\" >"
                        ."$tbdata[24]</attribute>\n";
        }
        if ($tbdata[25] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Zip Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Zip Address\" >"
                        ."$tbdata[25]</attribute>\n";
        }
        if ($tbdata[26] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Country Address\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Country Address\" >"
                        ."$tbdata[26]</attribute>\n";
        }
        if ($tbdata[12] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Phone\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Phone\" >"
                        ."$tbdata[12]</attribute>\n";
        }
        if ($tbdata[13] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Fax\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Fax\" >"
                        ."$tbdata[13]</attribute>\n";
        }
        if ($tbdata[31] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Business Homepage\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Business Homepage\" >"
                        ."$tbdata[31]</attribute>\n";
        }
        if ($tbdata[27] ne "") {
            $time++;
-           $sylph_addr .= "      <attribute uid=\"$time\" name=\"Notes\" >"
+           $claws_addr .= "      <attribute uid=\"$time\" name=\"Notes\" >"
                        ."$tbdata[27]</attribute>\n";
        }
-       $sylph_addr .= "    </attribute-list>\n";
+       $claws_addr .= "    </attribute-list>\n";
     }
 #    if ( $check > 0 ) {
-#        $sylph_addr .= "</attribute-list>\n";
+#        $claws_addr .= "</attribute-list>\n";
 #    }
 
-    $sylph_addr .=  "  </person>\n";
+    $claws_addr .=  "  </person>\n";
     $time++;
 }
-$sylph_addr .= "</address-book>\n";
+$claws_addr .= "</address-book>\n";
 
 # print new addressbook to file
 open (NEWADDR, ">.claws-mail/$new_addrbk");
-    print NEWADDR $sylph_addr;
+    print NEWADDR $claws_addr;
 close NEWADDR;
 
 # add new addressbook to index
similarity index 89%
rename from tools/tbird2syl.py
rename to tools/tbird2claws.py
index 4454856..398de28 100644 (file)
@@ -1,19 +1,19 @@
 #!/usr/bin/python
 
-# Script name : tbird2syl.py
-# Script purpose : Integrate a Thunderbird folder tree to S-Claws
+# Script name : tbird2claws.py
+# Script purpose : Integrate a Thunderbird folder tree to Claws Mail
 # Author : Aleksandar Urosevic aka Urke MMI <urke@gmx.net>
 # Licence : GPL
 # Author: Rodrigo Dias Arruda Senra
 
 #The script receives two parameters from command-line:
-#<Thunderbird folder path> <Sylpheed folder path>
+#<Thunderbird folder path> <Claws Mail folder path>
 
 #Best way to use it is to go to inside yout Thunderbird
 #root mailfolder directory and invoke it as:
 
-#<path>\python2.4 <path>\tbird2syl.py . <path to
-#sylpheed>\Mail
+#<path>\python2.4 <path>\tbird2claws.py . <path to
+#claws-mail>\Mail
 
 import os
 import sys
@@ -24,18 +24,18 @@ __version__ =  '0.3'
 
 __doc__ = r"""
 This module integrates your Mozilla Thunderbird 1.0 tree to
-your sylpheed MH mailbox tree.
+your Claws Mail MH mailbox tree.
 
 The script receives two parameters from command-line:
- <Thunderbird folder path> <Sylpheed folder path>
+ <Thunderbird folder path> <Claws Mail folder path>
 
 Best way to use it is to go to inside yout Thunderbird
 root mailfolder directory and invoke it as:
 
-  <path>\python2.4 <path>\tbird2syl.py . <path to sylpheed>\Mail
+  <path>\python2.4 <path>\tbird2syl.py . <path to claws mail>\Mail
 
 This idiom will avoid the creation of the folder Thunderbird inside
-your sylpheed folder tree.
+your Claws Mail folder tree.
 
 If the names of your directories match in both trees, files should
 be placed in the correct folder.