From 977fa3edad7e045ec2c6d1d1e8b7adaf44c06a56 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 21 Oct 2005 09:05:25 +0000 Subject: [PATCH] 2005-10-21 [paul] 1.9.15cvs87 * tools/Makefile.am * tools/OOo2sylpheed.pl * tools/README * tools/README.sylprint * tools/asus_mailled.sh ** REMOVED ** * tools/filter_conv.pl * tools/freshmeat_search.pl * tools/google_search.pl * tools/gpg-sign-syl ** REMOVED ** * tools/kmail2sylpheed.pl * tools/kmail2sylpheed_v2.pl * tools/multiwebsearch.pl * tools/nautilus2sylpheed.sh * tools/newscache_clean.pl * tools/outlook2sylpheed.pl * tools/sylpheed-switcher ** REMOVED ** * tools/sylprint.pl * tools/sylprint.rc * tools/tb2sylpheed * tools/vcard2xml.py * tools/kdeservicemenu/sylpheed-kdeservicemenu.pl update default config dir update binary name (thanks to Fabien Vantard) remove obsolete scripts --- ChangeLog-gtk2.claws | 27 +++ PATCHSETS | 1 + configure.ac | 2 +- tools/Makefile.am | 3 - tools/OOo2sylpheed.pl | 4 +- tools/README | 173 ++++++------------ tools/README.sylprint | 2 +- tools/asus_mailled.sh | 45 ----- tools/filter_conv.pl | 2 +- tools/freshmeat_search.pl | 2 +- tools/google_search.pl | 2 +- tools/gpg-sign-syl | 8 - .../kdeservicemenu/sylpheed-kdeservicemenu.pl | 2 +- tools/kmail2sylpheed.pl | 9 +- tools/kmail2sylpheed_v2.pl | 2 +- tools/multiwebsearch.pl | 8 +- tools/nautilus2sylpheed.sh | 2 +- tools/newscache_clean.pl | 4 +- tools/outlook2sylpheed.pl | 2 +- tools/sylpheed-switcher | 148 --------------- tools/sylprint.pl | 4 +- tools/sylprint.rc | 2 +- tools/tb2sylpheed | 8 +- tools/vcard2xml.py | 6 +- 24 files changed, 110 insertions(+), 358 deletions(-) delete mode 100644 tools/asus_mailled.sh delete mode 100644 tools/gpg-sign-syl delete mode 100644 tools/sylpheed-switcher diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 5ea0020e7..9f439f724 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,30 @@ +2005-10-21 [paul] 1.9.15cvs87 + + * tools/Makefile.am + * tools/OOo2sylpheed.pl + * tools/README + * tools/README.sylprint + * tools/asus_mailled.sh ** REMOVED ** + * tools/filter_conv.pl + * tools/freshmeat_search.pl + * tools/google_search.pl + * tools/gpg-sign-syl ** REMOVED ** + * tools/kmail2sylpheed.pl + * tools/kmail2sylpheed_v2.pl + * tools/multiwebsearch.pl + * tools/nautilus2sylpheed.sh + * tools/newscache_clean.pl + * tools/outlook2sylpheed.pl + * tools/sylpheed-switcher ** REMOVED ** + * tools/sylprint.pl + * tools/sylprint.rc + * tools/tb2sylpheed + * tools/vcard2xml.py + * tools/kdeservicemenu/sylpheed-kdeservicemenu.pl + update default config dir + update binary name (thanks to Fabien Vantard) + remove obsolete scripts + 2005-10-21 [cleroy] 1.9.15cvs86 * src/inc.c diff --git a/PATCHSETS b/PATCHSETS index a0ae91f07..6fd02026f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -923,3 +923,4 @@ ( cvs diff -u -r 1.654.2.963 -r 1.654.2.964 configure.ac; cvs diff -u -r 1.207.2.76 -r 1.207.2.77 src/folderview.c; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/headerview.c; cvs diff -u -r 1.115.2.61 -r 1.115.2.62 src/main.c; cvs diff -u -r 1.204.2.66 -r 1.204.2.67 src/prefs_common.c; cvs diff -u -r 1.103.2.34 -r 1.103.2.35 src/prefs_common.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_message.c; cvs diff -u -r 1.96.2.79 -r 1.96.2.80 src/textview.c; cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/textview.h; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/common/defs.h; cvs diff -u -r 1.36.2.46 -r 1.36.2.47 src/common/utils.c; cvs diff -u -r 1.20.2.25 -r 1.20.2.26 src/common/utils.h; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/gtkutils.h; ) > 1.9.15cvs84.patchset ( cvs diff -u -r 1.96.2.80 -r 1.96.2.81 src/textview.c; ) > 1.9.15cvs85.patchset ( cvs diff -u -r 1.149.2.37 -r 1.149.2.38 src/inc.c; ) > 1.9.15cvs86.patchset +( cvs diff -u -r 1.25.2.6 -r 1.25.2.7 tools/Makefile.am; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/OOo2sylpheed.pl; cvs diff -u -r 1.30.2.5 -r 1.30.2.6 tools/README; cvs diff -u -r 1.1 -r 1.2 tools/README.sylprint; cvs diff -u -r -1.1.2.2 -r -1.1.2.3 tools/asus_mailled.sh; cvs diff -u -r 1.16.2.2 -r 1.16.2.3 tools/filter_conv.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/freshmeat_search.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/google_search.pl; cvs diff -u -r -1.1 -r -1.2 tools/gpg-sign-syl; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 tools/kmail2sylpheed.pl; cvs diff -u -r 1.3.4.1 -r 1.3.4.2 tools/kmail2sylpheed_v2.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/multiwebsearch.pl; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 tools/nautilus2sylpheed.sh; cvs diff -u -r 1.2.14.1 -r 1.2.14.2 tools/newscache_clean.pl; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 tools/outlook2sylpheed.pl; cvs diff -u -r -1.1.14.1 -r -1.1.14.2 tools/sylpheed-switcher; cvs diff -u -r 1.2 -r 1.3 tools/sylprint.pl; cvs diff -u -r 1.1 -r 1.2 tools/sylprint.rc; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 tools/tb2sylpheed; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 tools/vcard2xml.py; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 tools/kdeservicemenu/sylpheed-kdeservicemenu.pl; ) > 1.9.15cvs87.patchset diff --git a/configure.ac b/configure.ac index 4f5938ba3..03955418e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=86 +EXTRA_VERSION=87 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/tools/Makefile.am b/tools/Makefile.am index aed380a06..24bb6e2cb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,14 +1,12 @@ EXTRA_TOOLS = \ OOo2sylpheed.pl \ acroread2sylpheed.pl \ - asus_mailled.sh \ calypso_convert.pl \ convert_mbox.pl \ eud2gc.py \ filter_conv.pl \ freshmeat_search.pl \ gif2xface.pl \ - gpg-sign-syl \ google_msgid.pl \ google_search.pl \ kmail2sylpheed.pl \ @@ -17,7 +15,6 @@ EXTRA_TOOLS = \ multiwebsearch.pl \ nautilus2sylpheed.sh \ outlook2sylpheed.pl \ - sylpheed-switcher \ sylprint.pl \ sylprint.rc \ tb2sylpheed \ diff --git a/tools/OOo2sylpheed.pl b/tools/OOo2sylpheed.pl index b6d587aa2..c6a865b5f 100644 --- a/tools/OOo2sylpheed.pl +++ b/tools/OOo2sylpheed.pl @@ -17,7 +17,7 @@ # * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # OOo2sylpheed.pl helper script to send documents from OpenOffice.org -# to sylpheed +# to Sylpheed-Claws use strict; @@ -26,7 +26,7 @@ my $input = <>; $ARGV =~ s/^"attachment='file:\/\///; $ARGV =~ s/'"$//; $ARGV =~ s/%20/ /g; -exec "sylpheed --attach \"$ARGV\""; +exec "sylpheed-claws --attach \"$ARGV\""; ## change the line above to point to your sylpheed executable exit; diff --git a/tools/README b/tools/README index fbb1ebe25..6490d9889 100644 --- a/tools/README +++ b/tools/README @@ -5,7 +5,6 @@ Contents of the tools directory: Action scripts: freshmeat_search.pl Search freshmeat.net for selected text - gpg-sign-syl Clear-sign current selection google_msgid.pl Search groups.google.com for selected message-id google_search.pl Search google.com for selected text multiwebsearch.pl Search any search engine for the selected text @@ -27,12 +26,9 @@ Mailbox conversion: Other tools: acroread2sylpheed.pl Send PDFs from Adobe Reader 7 - asus_mailed.sh makes the mail LED blink on new or unread mail - for ASUS laptops filter_conv.pl Convert old-style filters to new filtering nautilus2sylpheed.sh Send files from Nautilus OOo2sylpheed.pl Send documents from OpenOffice.org - sylpheed-switcher Run either sylpheed or claws (separate configs) sylprint.pl Printing engine, explained in README.sylprint update-po Update the .po files named on the command line. @@ -49,7 +45,7 @@ Action scripts * freshmeat_search.pl WORKS ON: selection COMMAND: |freshmeat_search.pl - Search freshmeat.net for selected text using the default Sylpheed browser + Search freshmeat.net for selected text using the default Sylpheed-Claws browser * google_msgid.pl WORKS ON: selection @@ -60,12 +56,7 @@ Action scripts * google_search.pl WORKS ON: selection COMMAND: |google_search.pl - Search google.com for selected text using the default Sylpheed browser - -* gpg-sign-syl - WORKS ON: selection, whole message - COMMAND: |gpg-sign-syl| - Clear-sign current selection using gpg. + Search google.com for selected text using the default Sylpheed-Claws browser * multiwebsearch.pl WORKS ON: selection @@ -89,9 +80,9 @@ Action scripts WHAT IT DOES This is an Actions script that allows you to search websites for the selected text. It uses the default - Sylpheed browser as configured through Sylpheed's - GUI and specified in ~/.sylpheed/sylpheedrc, and a - configuration file called multiwebsearch.conf. + Sylpheed-Claws browser as configured through Sylpheed + -Claws' GUI and specified in ~/.sylpheed-claws/sylpheedrc, + and a configuration file called multiwebsearch.conf. CONFIGURATION The configuration file takes the following format: @@ -105,7 +96,7 @@ Action scripts is included. HOW TO USE IT - Copy 'multiwebsearch.conf' to ~/.sylpheed/ + Copy 'multiwebsearch.conf' to ~/.sylpheed-claws/ Configure an Action: a) pre-configured website @@ -148,24 +139,24 @@ Address book conversion WHAT IT DOES This perl script will convert an exported Kmail addressbook into a - Sylpheed 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 + Sylpheed-Claws 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. HOW TO USE IT - (You must run sylpheed at least once before running this script.) + (You must run sylpheed-claws at least once before running this script.) In Kmail's Address book choose '/File/Export List'. This will export your Kmail address book data to a *.csv file. - If Sylpheed is running, close it. + If Sylpheed-Claws is running, close it. From the command line, execute the following: perl kmail2sylpheed.pl --kmailfile=/path/to/addressbook.csv - Your Kmail address book data will now be contained in Sylpheed's + Your Kmail address book data will now be contained in Sylpheed-Claws' address book, under the name 'Kmail Address Book'. Contact: Paul Mangan @@ -177,16 +168,16 @@ Address book conversion WHAT IT DOES This perl script will convert a Kmail address book that has been - exported in csv format into a Sylpheed address book. + exported in csv format into a Sylpheed-Claws address book. HOW TO USE IT - (You must run sylpheed at least once before running this script.) + (You must run sylpheed-claws at least once before running this script.) Open Kmail's Addressbook, /File/Address Book In Kmail's Addressbook choose '/File/Export/Export List...'. This will allow you to export your Kmail addressbook data to a *.csv file. - If Sylpheed is running, close it. + If Sylpheed-Claws is running, close it. From the command line, execute the following: @@ -194,7 +185,7 @@ Address book conversion You can also use --help to see usage instructions. - Your Kmail addressbook data will now be contained in Sylpheed's + Your Kmail addressbook data will now be contained in Sylpheed-Claws' addressbook, under the name 'Kmail address book'. Contact: Paul Mangan @@ -204,7 +195,7 @@ Address book conversion WHAT IT DOES This perl script converts an Outlook generated contact list into a - Sylpheed XML address book. + Sylpheed-Claws XML address book. HOW TO USE IT For text files: @@ -212,7 +203,7 @@ Address book conversion You must export Outlook Express contact list as TXT file, choosing only "Name" and "Address" fields to export. - You must exit Sylpheed before converting the contact list. + You must exit Sylpheed-Claws before converting the contact list. From the command line, execute the following: @@ -223,7 +214,7 @@ Address book conversion You must export Outlook contact list as CSV file, choosing ALL the fields available for exporting. - You must exit Sylpheed before converting the contact list. + You must exit Sylpheed-Claws before converting the contact list. From the command line, execute the following: @@ -235,8 +226,8 @@ Address book conversion script. For csv files you must export all fields (but only non empty fields - are added to the created Sylpheed address book) and the number of - fields expected is harcoded. Look for the $nboffields variable in + are added to the created Sylpheed-Claws address book) and the number + of fields expected is harcoded. Look for the $nboffields variable in the script and change its value if you are sure you exported all fields and script gives the 'unknown csv file format' error. @@ -247,19 +238,19 @@ Address book conversion WHAT IT DOES This perl script will convert an address book exported from The Bat! - into a Sylpheed address book. + into a Sylpheed-Claws address book. HOW TO USE IT - (You must run sylpheed at least once before running this script.) + (You must run sylpheed-claws at least once before running this script.) - If Sylpheed is running, close it. + If Sylpheed-Claws is running, close it. 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 - The Bat! addressbook data will now be contained in Sylpheed's + The Bat! addressbook data will now be contained in Sylpheed-Claws' addressbook, under the name 'The Bat! Address Book'. Contact: Urke MMI @@ -268,13 +259,13 @@ Address book conversion * vcard2xml.py WHAT IT DOES - This python script will convert an Evolution vCard into a Sylpheed + This python script will convert an Evolution vCard into a Sylpheed-Claws address book. HOW TO USE IT - (You must run sylpheed at least once before running this script.) + (You must run sylpheed-claws at least once before running this script.) - If Sylpheed is running, close it. + If Sylpheed-Claws is running, close it. From the command line, execute the following: vcard2xml.py source_file [destination_file] @@ -324,7 +315,7 @@ Mailbox conversion WHAT IT DOES This perl script converts an mbox directory's contents into - Sylpheed's MH format. + Sylpheed-Claws' MH format. HOW TO USE IT @@ -332,9 +323,9 @@ Mailbox conversion perl convert_mbox.pl MBOX MH_DIR - Move the outputted MH_DIR and its contents into your Sylpheed - Mail folder; in Sylpheed right-click the top-level folder - and choose 'Rebuild folder tree' from the popup menu. + Move the outputted MH_DIR and its contents into your Sylpheed-Claws + Mail folder; in Sylpheed-Claws right-click the top-level folder and + choose 'Rebuild folder tree' from the popup menu. Contact: Fred Marton @@ -342,17 +333,17 @@ Mailbox conversion WHAT IT DOES This perl script converts a mailbox in maildir format into - Sylpheed's MH format. + Sylpheed-Claws' MH format. HOW TO USE IT - Exit Sylpheed if running. + Exit Sylpheed-Claws if running. Run the script using: perl maildir2sylpheed.pl --kmaildir=mail_folder_name - Start Sylpheed and right-click the toplevel mailbox, i.e + Start Sylpheed-Claws and right-click the toplevel mailbox, i.e "Mailbox (MH)", and select 'Rebuild folder tree'. You may also need to run '/File/Folder/Check for new messages in all folders' @@ -372,8 +363,8 @@ Other tools * acroread2sylpheed.pl WHAT IT DOES - This perl script enables Adobe Reader 7 to send documents to sylpheed - as attachments. + This perl script enables Adobe Reader 7 to send documents to + Sylpheed-Claws as attachments. HOW TO USE IT Make sure that the script is executable (chmod +x acroread2sylpheed.pl) @@ -383,36 +374,19 @@ Other tools Enter the path to this script in the alternate location box You can then use 'File/Email' or the Email toolbar button to launch - sylpheed (if not already launched) and open a new compose window with - the PDF attached. + sylpheed-claws (if not already launched) and open a new compose window + with the PDF attached. Contact: Paul Mangan -* asus_mailed.sh - - WHAT IT DOES - When used as the new mail notification command, this script makes - the mail LED blink on new or unread mail for ASUS laptops with - asus_acpi compiled in the kernel or loaded as module. - - HOW TO USE IT - Make sure that the script is executable (chmod +x asus_mailed.sh) - Go to /Preferences/Mail Handling/Receive/ - In the 'Run command when new mail arrives' frame select one or - both of the checkboxes, the enter the path to this script in the - 'Command to execute' box. - - Contact: Colin Leroy - - * filter_conv.pl WHAT IT DOES This perl script provides easy conversion of your filtering rules form sylpheed's old filter system (pre version 0.9.99) to the new filtering system used in sylpheed-claws. - It reads '~/.sylpheed/filterrc' and outputs '~/.sylpheed/matcherrc'. + It reads '~/.sylpheed/filterrc' and outputs '~/.sylpheed-claws/matcherrc'. HOW TO USE IT Issue the following command from the 'tools' directory: @@ -442,8 +416,8 @@ Other tools * OOo2sylpheed.pl WHAT IT DOES - This perl script enables OpenOffice.org to send documents to sylpheed - as attachments. + This perl script enables OpenOffice.org to send documents to + Sylpheed-Claws as attachments. HOW TO USE IT OpenOffice.org Version 1.0 @@ -462,61 +436,15 @@ Other tools Enter the path to OOo2sylpheed.pl in the 'Path' box or select it by clicking on the '...' button. - You can then use 'File/Send/Document as email' to launch sylpheed - (if not already launched) and open a new compose window with the - document attached. + You can then use 'File/Send/Document as email' to launch + sylpheed-claws (if not already launched) and open a new compose + window with the document attached. Tested with OpenOffice.org versions 1.0, 1.1.0 Contact: Paul Mangan -* sylpheed-switcher - - WHAT IT DOES - This perl script is for users who like to move between the main - sylpheed branch and the claws branch. Because of some differences - between the stored options it is better IMO to use two separate - '.sylpheed' directory trees. Doing that manually could prove to - be tiresome, and so I've written this script to automate the task. - - The first time you run this script you enter the full paths, - including the executable itself, to both the main version of - sylpheed and the claws version. This information is then stored - in a file in your $HOME directory called '.sylpheed-switcher' - - During this initial set-up, your '~/.sylpheed' directory - is copied to '~/.sylpheed-main' and '~/.sylpheed-claws'. - - When you run sylpheed via this script, your '~/.sylpheed' directory - is deleted and replaced with a symbolic link to either - ~/.sylpheed-main' or '~/sylpheed-claws', depending on the option you - choose. (On subsequent usage the symbolic link is deleted and replaced - with a new symbolic link). - - HOW TO USE IT - Initial set-up - Enter the full paths to the executable, including the executable itself, - example: - - ./sylpheed-switcher --claws-path=/usr/local/bin/sylpheed - --main-path=/usr/bin/sylpheed - - After the initial set-up, use the following: - - ./sylpheed-switcher --claws (to run sylpheed-claws) - ./sylpheed-switcher --main (to run sylpheed main) - - Additionally you can append --debug to run in debug mode. - Use --help for more info. - - This script uses the File::Path and Getopt::Long modules, if you don't - already have them installed, you can find them at the CPAN search site - - - Contact: Paul Mangan - - * update-po WHAT IT DOES @@ -546,8 +474,9 @@ Extra tools WHAT IT DOES This perl script converts a monochrome (1 bit) 48x48 pixels GIF file into an X-Face graphic suitable for inclusion into custom headers of - Sylpheed. An X-Face allows to quickly identify (or be identified as) - the sender of a mail message in a xface-capable MUA (like sylpheed). + Sylpheed-Claws. An X-Face allows to quickly identify (or be identified + as) the sender of a mail message in a xface-capable MUA (like sylpheed + -claws). HOW TO USE IT After obtaining the desired image for your X-Face you should: @@ -562,11 +491,11 @@ Extra tools ./gif2xface < filename.gif > filename.xface In filename.xface will be the X-Face header ready to use. - You can add a custom header in Sylpheed through Configuration-> + You can add a custom header in Sylpheed-Claws through Configuration-> Preferences per account, "Send" tab, check "Add user-defined header" - then "Edit..." if you want to add it via Sylpheed interface, or do + then "Edit..." if you want to add it via Sylpheed -Claws interface, or do - echo "0:" `cat filename.xface` > ~/.sylpheed/customheaderrc + echo "0:" `cat filename.xface` > ~/.sylpheed-claws/customheaderrc if you want to create the custom headers file yourself (Warning: this method is valid only if you don't have any other custom header set or diff --git a/tools/README.sylprint b/tools/README.sylprint index 3113318ce..cda66c6a8 100644 --- a/tools/README.sylprint +++ b/tools/README.sylprint @@ -148,7 +148,7 @@ FILES Stores user default preferred configuration for the script. Settings in this file may be overriden by command line options. Must be stored in the same - directory of the script and/or in the ~/.sylpheed + directory of the script and/or in the ~/.sylpheed-claws one (Sylpheed user's configuration directory). /tmp/sylprint.username.number diff --git a/tools/asus_mailled.sh b/tools/asus_mailled.sh deleted file mode 100644 index 70e649651..000000000 --- a/tools/asus_mailled.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# Sylpheed -- a GTK+ based, lightweight, and fast e-mail client -# Copyright (C) 2005 Colin Leroy /proc/acpi/asus/mled - exit - fi - if [ "$num" != "0" ]; then - echo $last > /proc/acpi/asus/mled - if [ "$last" == "0" ]; then - last=1; - else - last=0; - fi - else - echo 0 > /proc/acpi/asus/mled - fi -done; diff --git a/tools/filter_conv.pl b/tools/filter_conv.pl index f0cbbc26c..fe5a382cd 100644 --- a/tools/filter_conv.pl +++ b/tools/filter_conv.pl @@ -21,7 +21,7 @@ use strict; # * my $old_config_dir = "$ENV{HOME}/.sylpheed"; -my $config_dir = `sylpheed --config-dir`; +my $config_dir = `sylpheed-claws --config-dir`; chomp $config_dir; chdir($ENV{ HOME } . "/$config_dir") diff --git a/tools/freshmeat_search.pl b/tools/freshmeat_search.pl index b45a9ae4e..9ff0086c4 100644 --- a/tools/freshmeat_search.pl +++ b/tools/freshmeat_search.pl @@ -20,7 +20,7 @@ my $freshmeat = "http://freshmeat.net/search?q"; $_ = <>; -chdir($ENV{HOME} . "/.sylpheed") || die("Can't find your .sylpheed directory\n"); +chdir($ENV{HOME} . "/.sylpheed-claws") || die("Can't find your .sylpheed-claws directory\n"); open (SYLRC, "; diff --git a/tools/google_search.pl b/tools/google_search.pl index 7b9487b26..6f0d68fa5 100644 --- a/tools/google_search.pl +++ b/tools/google_search.pl @@ -20,7 +20,7 @@ my $google = "http://www.google.com/search?q"; $_ = <>; -chdir($ENV{HOME} . "/.sylpheed") || die("Can't find your .sylpheed directory\n"); +chdir($ENV{HOME} . "/.sylpheed-claws") || die("Can't find your .sylpheed-claws directory\n"); open (SYLRC, "; diff --git a/tools/gpg-sign-syl b/tools/gpg-sign-syl deleted file mode 100644 index 0c7122b9f..000000000 --- a/tools/gpg-sign-syl +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -TMPFILE=`mktemp $HOME/.iXXXXXX` || exit 1 -TMPFILE2=`mktemp $HOME/.oXXXXXX` || exit 1 -cat - > $TMPFILE -xterm -T "GnuPG - Message Signing" -geometry 80x8 -e gpg --clearsign --yes -o $TMPFILE2 $TMPFILE -cat $TMPFILE2 -rm $TMPFILE -rm $TMPFILE2 diff --git a/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl b/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl index 1a6a78644..4997e97cb 100644 --- a/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl +++ b/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl @@ -18,7 +18,7 @@ unless ($ARGV[0]) { exit; } -my $sylpheed = "sylpheed --compose --attach"; +my $sylpheed = "sylpheed-claws --compose --attach"; my $prefix = "/tmp/archive."; my $command = find_command($ARGV[0]); my ($sel,$att) = split_parts(); diff --git a/tools/kmail2sylpheed.pl b/tools/kmail2sylpheed.pl index d594239d7..41f6c1f4d 100644 --- a/tools/kmail2sylpheed.pl +++ b/tools/kmail2sylpheed.pl @@ -32,9 +32,8 @@ $sylph_addr = "\n"; $sylph_addr .= "\n"; chdir; -#chdir '.sylpheed' || die("You don't appear to have Sylpheed installed\n"); -opendir(SYLPHEED, ".sylpheed") || die("Can't open .sylpheed directory\n"); +opendir(SYLPHEED, ".sylpheed-claws") || die("Can't open .sylpheed-claws directory\n"); push(@cached,(readdir(SYLPHEED))); closedir(SYLPHEED); @@ -187,11 +186,11 @@ foreach $kmailline (@kmaillines) { } $sylph_addr .= "\n"; -open (NEWADDR, ">.sylpheed/$new_addrbk"); +open (NEWADDR, ">.sylpheed-claws/$new_addrbk"); print NEWADDR $sylph_addr; close NEWADDR; -open (ADDRIN, "<.sylpheed/addrbook--index.xml") || die("can't open addrbook--index.xml"); +open (ADDRIN, "<.sylpheed-claws/addrbook--index.xml") || die("can't open addrbook--index.xml"); @addrindex_file = ; close ADDRIN; @@ -204,7 +203,7 @@ foreach $addrindex_line (@addrindex_file) { } } -open (NEWADDRIN, ">.sylpheed/addrbook--index.xml"); +open (NEWADDRIN, ">.sylpheed-claws/addrbook--index.xml"); print NEWADDRIN "$rewrite_addrin"; close NEWADDRIN; diff --git a/tools/kmail2sylpheed_v2.pl b/tools/kmail2sylpheed_v2.pl index 0cad5773e..205f8deb9 100644 --- a/tools/kmail2sylpheed_v2.pl +++ b/tools/kmail2sylpheed_v2.pl @@ -40,7 +40,7 @@ if ($kmailfile eq "" || $iNeedHelp) { exit; } -$sylph_dir = ".sylpheed"; +$sylph_dir = ".sylpheed-claws"; $addr_index = "$sylph_dir/addrbook--index.xml"; $new_addressbook = "Kmail address book"; diff --git a/tools/multiwebsearch.pl b/tools/multiwebsearch.pl index c6bc9decf..1785ca5ab 100644 --- a/tools/multiwebsearch.pl +++ b/tools/multiwebsearch.pl @@ -27,11 +27,11 @@ GetOptions("where=s" => \$where, $what =~ s/\s/%20/g; -chdir($ENV{HOME} . "/.sylpheed") - || die("Can't find your ~/.sylpheed directory\n"); +chdir($ENV{HOME} . "/.sylpheed-claws") + || die("Can't find your ~/.sylpheed-claws directory\n"); open (CONF, "; close CONF; @@ -51,7 +51,7 @@ if (!$url) { } open (SYLRC, "; close SYLRC; diff --git a/tools/nautilus2sylpheed.sh b/tools/nautilus2sylpheed.sh index 677c81324..fcb64fe12 100644 --- a/tools/nautilus2sylpheed.sh +++ b/tools/nautilus2sylpheed.sh @@ -50,5 +50,5 @@ done echo "-----------" echo ${ATTACHMENTS} -eval "sylpheed --compose --attach ${ATTACHMENTS}" +eval "sylpheed-claws --compose --attach ${ATTACHMENTS}" diff --git a/tools/newscache_clean.pl b/tools/newscache_clean.pl index fb61dfd77..b00ee5d4a 100644 --- a/tools/newscache_clean.pl +++ b/tools/newscache_clean.pl @@ -20,7 +20,7 @@ use File::Path; chdir; -chdir '.sylpheed' || die("You don't appear to have Sylpheed installed\n"); +chdir '.sylpheed-claws' || die("You don't appear to have Sylpheed-Claws installed\n"); open(ACCOUNTRC, "; @@ -84,5 +84,5 @@ foreach $folderlist (@folderlist) { ## remove old newsgroups directory trees } } } -print "Finished cleaning Sylpheed's newscache\n"; +print "Finished cleaning Sylpheed-Claws' newscache\n"; exit; diff --git a/tools/outlook2sylpheed.pl b/tools/outlook2sylpheed.pl index 2b43649ee..49959a61f 100644 --- a/tools/outlook2sylpheed.pl +++ b/tools/outlook2sylpheed.pl @@ -41,7 +41,7 @@ else { $outl_file = $ARGV[0]; } # some init -$sylconf = ".sylpheed"; +$sylconf = ".sylpheed-claws"; $indexname = "$sylconf/addrbook--index.xml"; # the next is mostly Paul's code diff --git a/tools/sylpheed-switcher b/tools/sylpheed-switcher deleted file mode 100644 index 995b647f6..000000000 --- a/tools/sylpheed-switcher +++ /dev/null @@ -1,148 +0,0 @@ -#!/usr/bin/perl - -# * Copyright © 2001 Paul Mangan -# * -# * 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 -# * the Free Software Foundation; either version 2 of the License, or -# * (at your option) any later version. -# * -# * This program is distributed in the hope that it will be useful, but -# * WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# * General Public License for more details. -# * -# * You should have received a copy of the GNU General Public License -# * 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: The Nasnas -# Script Version: 0.4 - -###################################################### -###################################################### -### ### -### FOR USAGE INSTRUCTIONS RUN THIS SCRIPT WITH ### -### THE FOLLOWING OPTION: ### -### ### -### ./sylpheed-switcher --help ### -### ### -###################################################### -###################################################### - -use File::Path; -use Getopt::Long; - -my $sylpheed = 0; -my $claws = 0; -my $sylphpath = ''; -my $clawspath = ''; -my $debug = 0; -my $YouWantHelp = 0; - -GetOptions("main" => \$sylpheed, - "claws" => \$claws, - "main-path=s" => \$sylphpath, - "claws-path=s" => \$clawspath, - "debug" => \$debug, - "help" => \$YouWantHelp); - -chdir; ## use $HOME for the working directory - -unless (-e ".sylpheed") { ## check for the .sylpheed directory - print "Your '.sylpheed' directory is missing. This probably means that "; - print "you have never run sylpheed before.\n"; - print "Before running sylpheed-switcher run sylpheed normally at least once.\n"; - exit; -} - -open (SYLSWIT, "<.sylpheed-switcher"); ## read the config file - @conf_file = ; -close SYLSWIT; - -if ($sylphpath && $clawspath) { ## this is the initial set-up part -## write the config file - $PATH_INFO = "$clawspath\n$sylphpath"; - open (CONFFILE, ">.sylpheed-switcher"); - print CONFFILE $PATH_INFO; - close CONFFILE; -## it appears that you'd run this script before, but the config file was missing - $DIR_CHECK = opendir(CHECKDIR, ".sylpheed-claws"); - closedir(CHECKDIR); - if ($DIR_CHECK == 1) { - print "\nNow you can run either the main branch or the claws\n"; - print "branch by using one of the following options:\n\n"; - print "./sylpheed-switcher --main\n./sylpheed-switcher --claws\n\n"; - exit; - } -## copy the directory tree - system "cp -R .sylpheed .sylpheed-main"; - system "cp -R .sylpheed .sylpheed-claws"; -## when setting-up is done print a little message - print "\nNow you can run either the main branch or the claws\n"; - print "branch by using one of the following options:\n\n"; - print "./sylpheed-switcher --main\n./sylpheed-switcher --claws\n\n"; - exit; -} -## the --help option stuff -if ($YouWantHelp) { - print "\n The SYLPHEED<->CLAWS SWITCHER\n\n"; - print "If you are running this script for the first time you will need \n"; - print "to set up the configuration. Here is an example, adjust the paths\n"; - print "to suit your set-up, but remember you need the full path with the\n"; - print "executable included:\n"; - print "./sylpheed-switcher --main-path=/usr/local/bin/sylpheed --claws-path=/usr/bin/sylpheed\n\n"; - print "When you have done the initial set-up, you run either the main branch\n"; - print "or the claws branch by using one of the following switches:\n\n"; - print "./sylpheed-switcher --main\n./sylpheed-switcher --claws\n\n"; - print "Add --debug to run sylpheed in debug mode\n\n"; - exit; -} -## if the config file doesn't exist... -if (!@conf_file) { - print "Use the following set-up options first, or --help for more info:\n"; - print "--claws-path=PATH # path to (and including) the claws sylpheed executable\n"; - print "--main-path=PATH # path to (and including) the main sylpheed executable\n"; - exit; -} -## check that the chosen execuatble exists -## get rid of the old symbolic link, make a new one, and run the required executable -if ($claws) { - chomp $conf_file[0]; - unless (-e $conf_file[0]) { - print "\n$conf_file[0] does not exist\n\n"; - exit; - } - rmtree(".sylpheed"); - symlink(".sylpheed-claws",".sylpheed"); - if ($debug eq 1) { - exec "$conf_file[0] --debug"; - } else { - exec "$conf_file[0]"; - } - exit; -} elsif ($sylpheed) { - chomp $conf_file[1]; - unless (-e $conf_file[1]) { - print "\n$conf_file[1] does not exist\n\n"; - exit; - } - rmtree(".sylpheed"); - symlink(".sylpheed-main",".sylpheed"); - if ($debug eq 1) { - exec "$conf_file[1] --debug"; - } else { - exec "$conf_file[1]"; - } - exit; -} elsif (!$claws && !$sylpheed && @conf_file) { ## you've got the config file but haven't said - print "\nUse one of the following switches:\n"; ## which version you want to run - print " --main # to run sylpheed main\n"; - print " --claws # to run sylpheed claws\n"; - print " --help # to view the help message\n"; - print "Optionally, you can also use:\n"; - print " --debug # to run in debug mode [optional]\n\n"; - exit; -} -############################### diff --git a/tools/sylprint.pl b/tools/sylprint.pl index 993aa7359..4b253ac4b 100644 --- a/tools/sylprint.pl +++ b/tools/sylprint.pl @@ -41,7 +41,7 @@ else { $spp = join('/',@spp); $rcf="$spp$rc"; if (-x $rcf) { do $rcf; } - $rcf="$ENV{'HOME'}/.sylpheed/$rc"; + $rcf="$ENV{'HOME'}/.sylpheed-claws/$rc"; if (-x $rcf) { do $rcf; } } @forens = (); @@ -315,7 +315,7 @@ else { # no enscript, try lpr system(@vcmd); } if ($preview < 2) { - @lprcmd = ($LPR,'-T','Sylpheed Mail', + @lprcmd = ($LPR,'-T','Sylpheed-Claws Mail', ($headerformat eq '')? '-l': '-p','-P',$printer,@forens, $tmpfn); die "trying lpr: $! \n" unless (system(@lprcmd) != -1); } diff --git a/tools/sylprint.rc b/tools/sylprint.rc index e44d462c6..cbbf0b3ee 100644 --- a/tools/sylprint.rc +++ b/tools/sylprint.rc @@ -5,7 +5,7 @@ # your personal default preferences. Some of the values can # still be changed from the command line options if required. # This file must have exec permissions set and be located in -# sylprint.pl directory and/or ~/.sylpheed to be used. +# sylprint.pl directory and/or ~/.sylpheed-claws to be used. # # (c) 2001 by Ricardo Mones Lastra # This program is released under the GNU General Public License. diff --git a/tools/tb2sylpheed b/tools/tb2sylpheed index 06d712829..15d888889 100644 --- a/tools/tb2sylpheed +++ b/tools/tb2sylpheed @@ -43,7 +43,7 @@ $total_addresses = 0; chdir; # check is Sylpheed instrtalled -opendir(SYLPHEED, ".sylpheed") || die("Can't open Sylpheed directory! Conversion abroted\n"); +opendir(SYLPHEED, ".sylpheed-claws") || die("Can't open Sylpheed-Claws directory! Conversion abroted\n"); push(@cached, (readdir(SYLPHEED))); closedir(SYLPHEED); @@ -251,12 +251,12 @@ foreach $tbline (@tblines) { $sylph_addr .= "\n"; # print new addressbook to file -open (NEWADDR, ">.sylpheed/$new_addrbk"); +open (NEWADDR, ">.sylpheed-claws/$new_addrbk"); print NEWADDR $sylph_addr; close NEWADDR; # add new addressbook to index -open (ADDRIN, "<.sylpheed/addrbook--index.xml") || die("Can't open addrbook--index.xml"); +open (ADDRIN, "<.sylpheed-claws/addrbook--index.xml") || die("Can't open addrbook--index.xml"); @addrindex_file = ; close ADDRIN; @@ -269,7 +269,7 @@ foreach $addrindex_line (@addrindex_file) { } } -open (NEWADDRIN, ">.sylpheed/addrbook--index.xml"); +open (NEWADDRIN, ">.sylpheed-claws/addrbook--index.xml"); print NEWADDRIN "$rewrite_addrin"; close NEWADDRIN; print "You have sucessfully converted your The Bat! addressbook\n"; diff --git a/tools/vcard2xml.py b/tools/vcard2xml.py index 5ededf07a..48962c3d4 100644 --- a/tools/vcard2xml.py +++ b/tools/vcard2xml.py @@ -151,12 +151,12 @@ def execute () : if len(sys.argv) <> 3 and len(sys.argv) <> 2 : print str("\nUsage: vcard2xml.py source_file [destination_file]\n\n" + '\tWhen only is specified will overwrite the existing addressbook.\n'+ - '\tWhen both arguments are suplied will create a new additional addressbook named \n\tas the destination file.'+'\n\tNOTE: in both cases the sylpheed must be closed and ran at least once.\n\n') + '\tWhen both arguments are suplied will create a new additional addressbook named \n\tas the destination file.'+'\n\tNOTE: in both cases the Sylpheed-Claws must be closed and ran at least once.\n\n') sys.exit(1) in_file = None out_file = None - path_to_out = os.environ['HOME']+'/.sylpheed/' + path_to_out = os.environ['HOME']+'/.sylpheed-claws/' adr_idx = 'addrbook--index.xml' adr_idx_file = None tmp_adr_idx_file= None @@ -189,7 +189,7 @@ def execute () : tmp_adr_idx_file = open(path_to_out+adr_idx+'.tmp') adr_idx_file = open(path_to_out+adr_idx,'w') except Exception, e : - print 'Could not open <', path_to_out+adr_idx,'> file. Make sure you started sylpheed at least once.' + print 'Could not open <', path_to_out+adr_idx,'> file. Make sure you started Sylpheed-Claws at least once.' sys.exit(1) try : out_file = open(path_to_out+sys.argv[2],'w')