2007-11-04 [paul] 3.0.2cvs115

	* tools/README
	* tools/claws-mail-compose-insert-files.pl
		add --bcc and uri_escape() everything

diff --git a/ChangeLog b/ChangeLog
index f9cbbb8a0bdccd58365337b30aa0c7d489fea0dd..5e1daa4f098fc4d32c3047bf51632cba19747384 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04 [paul]      3.0.2cvs115
+
+       * tools/README
+       * tools/claws-mail-compose-insert-files.pl
+               add --bcc and uri_escape() everything
+
 2007-11-04 [paul]      3.0.2cvs114
 
        * src/gtk/gtkutils.c

diff --git a/PATCHSETS b/PATCHSETS
index 53412e2be2bd84b818dc6070579861e38039e37f..0eff9fb581ca6d30e90b801be8fab67da1df15c9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3027,3 +3027,4 @@
 ( cvs diff -u -r 1.100.2.56 -r 1.100.2.57 AUTHORS;  cvs diff -u -r 1.382.2.418 -r 1.382.2.419 src/compose.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/gtk/authors.h;  ) > 3.0.2cvs112.patchset
 ( cvs diff -u -r 1.36.2.121 -r 1.36.2.122 src/common/utils.c;  ) > 3.0.2cvs113.patchset
 ( cvs diff -u -r 1.5.2.70 -r 1.5.2.71 src/gtk/gtkutils.c;  ) > 3.0.2cvs114.patchset
+( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 tools/README;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/claws-mail-compose-insert-files.pl;  ) > 3.0.2cvs115.patchset

diff --git a/configure.ac b/configure.ac
index ec680119a47e796dd5cd21e880bbe3ce4fb4fb18..7c8ef2fc0c84fd68c694cae28ce92fc5a03fd573 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=114
+EXTRA_VERSION=115
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/README b/tools/README
index 6b988e03101859b2590b14690310e27ec2d23732..ea9387b2afb1dd77eca7975e3be7c6ce5d79c60f 100644 (file)
--- a/tools/README
+++ b/tools/README
@@ -442,18 +442,21 @@ Other tools
   WHAT IT DOES
        This script enables inserting files into the message body of a new 
        Claws Mail Compose window from the command line. Additionally To,
-       Cc, Subject and files to attach to the message can be specified. 
+       Cc, Bcc, Subject and files to attach to the message can be specified. 
 
   HOW TO USE IT
        claws-mail-compose-insert-files.pl [options]
        Options:
-               --help -h
-               --to mail@address.net[,mail2@address.net]
-               --cc mail@address.net[,mail2@address.net]
-               --subject "My subject"
-               --attach FILE
-               --insert FILE
-
+               --help -h
+               --to "Person One <mail@address.net>"
+               --cc "Person One <mail@address.net>"
+                       --bcc "Person One <mail@address.net>"
+               --subject "My subject"
+               --attach FILE
+               --insert FILE
+
+       For multiple recipients separate the addresses with ','
+       e.g. --to "Person One <mail@address.net>,Person Two <mail2@address.net>"
        --attach and --insert can be used multiple times
   
   Contact: Paul Mangan <paul@claws-mail.org>

diff --git a/tools/claws-mail-compose-insert-files.pl b/tools/claws-mail-compose-insert-files.pl
index 2ee529d22f23790421007d63697881a12aa37bac..ee99641c28a58c1759488fb17843d89502b5494e 100644 (file)
--- a/tools/claws-mail-compose-insert-files.pl
+++ b/tools/claws-mail-compose-insert-files.pl
@@ -23,19 +23,21 @@ use URI::Escape;
 #  *
 
 # This script enables inserting files into the message body of a new Claws Mail
-# Compose window from the command line. Additionally To, Cc, Subject and files
-# to attach to the message can be specified 
+# Compose window from the command line. Additionally To, Cc, Bcc, Subject and
+# files to attach to the message can be specified 
 
 my (@inserts,@attachments,@lines,@output) = ();
 my $body = "";
 my $attach_list = "";
 my $to = "";
 my $cc = "";
+my $bcc = "";
 my $subject = "";
 my $help = "";
 
 GetOptions("to=s"      => \$to,
           "cc=s"      => \$cc,
+          "bcc=s"     => \$bcc,
           "subject=s" => \$subject,
           "attach=s"  => \@attachments,
           "insert=s"  => \@inserts,
@@ -63,9 +65,13 @@ foreach my $line (@output) {
        $body .= "$line";
 }
 
+$to = uri_escape($to);
+$cc = uri_escape($cc);
+$bcc = uri_escape($bcc);
+$subject = uri_escape($subject);
 $body = uri_escape($body);
 
-system("claws-mail --compose \"mailto:$to?subject=$subject&cc=$cc&body=$body\" --attach $attach_list");
+system("claws-mail --compose \"mailto:$to?subject=$subject&cc=$cc&bcc=$bcc&body=$body\" --attach $attach_list");
 
 exit;
 
@@ -75,12 +81,15 @@ Usage:
        claws-mail-compose-insert-files.pl [options]
 Options:
        --help -h
-       --to mail@address.net[,mail2@address.net]
-       --cc mail@address.net[,mail2@address.net]
+       --to "Person One <mail@address.net>"
+       --cc "Person One <mail@address.net>"
+       --bcc "Person One <mail@address.net>"
        --subject "My subject"
        --attach FILE
        --insert FILE
 
+For multiple recipients separate the addresses with ','
+e.g. --to "Person One <mail@address.net>,Person Two <mail2@address.net>"
 --attach and --insert can be used multiple times
 
 EOH