tools/gpg-sign *REMOVED*

tools/gpg-sign-syl *ADDED*
	Replaced the gpg clearsigning script with the version using
	xterm instead of ssh-askpass and changed its name.

README.claws
	Updated actions example to reflect the renaming of the
	gpg clearsigning script.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 32213c999095fe3788df4fddc220635e6a758837..98975815008af2a130d9064449ca3f2215e045f9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2002-06-20 [melvin]    0.7.8claws10
+
+       * tools/gpg-sign *REMOVED*
+         tools/gpg-sign-syl *ADDED*
+               Replaced the gpg clearsigning script with the version using
+               xterm instead of ssh-askpass and changed its name.
+
+       * README.claws
+               Updated actions example to reflect the renaming of the
+               gpg clearsigning script.
+
 2002-06-19 [paul]      0.7.8claws9
 
        * sync with 0.7.8claws9
@@ -85,7 +96,7 @@
        * src/mainwindow.[ch]
                more cleanups (removing unnecessary menu items Expand 
                summary / message view)
-       
+
 2002-06-13 [melvin]    0.7.6claws44
 
        * po/POTFILES.in

diff --git a/README.claws b/README.claws
index e101cf60389f16f67845e5ce505dfeb5f9fe0818..09c97f4da4a74920dd3c2459bb292fc524c73006 100644 (file)
--- a/README.claws
+++ b/README.claws
@@ -231,7 +231,7 @@ are hardly noticeable, but deserve mentioning:
 
   Purpose:     Display uuencoded image
   Definition:  Display uuencoded: uudec %f&
-  Details:     Displays uuencoded files. The uudec script can be found in 
+  Details:     Displays uuencoded files. The uudec[1] script can be found in 
                the 'tools' directory of the distribution package.
  
   Purpose:     Alter messages
@@ -250,9 +250,9 @@ are hardly noticeable, but deserve mentioning:
   Details:     Browse the selected message part in Dillo.
 
   Purpose:     Clear Sign
-  Definition:  GnuPG/Clear Sign: |gpg-sign|
-  Details:     Clear sign a message. The gpg-sign script is responsible for 
-               asking the passphrase and for running gnupg. 
+  Definition:  GnuPG/Clear Sign: |gpg-sign-syl|
+  Details:     Clear sign a message. The gpg-sign-syl[2] script is responsible
+               for asking the passphrase and for running gnupg. 
 
   Purpose:     Verify Clear Signed
   Definition:  GnuPG/Verify: |gpg --no-tty --verify
@@ -264,17 +264,14 @@ are hardly noticeable, but deserve mentioning:
   Details:     Decrypt ASCII armored messages. The passphrase is entered 
                into the opened action's input dialog.
 
-  The gpg-sign script can be found in the 'tools' directory of the 
-  distribution package. It needs the ssh-askpass utility found in OpenSSH. 
-  It can be replaced by any X11 tool that asks some (hidden) text which is 
-  then sent to standard output.
-
-  The uudec script can be found in the 'tools' directory of the 
+  [1] The uudec script can be found in the 'tools' directory of the 
   distribution package. It needs uudecode and ImageMagick's display. The 
   latter can be replaced by any image viewer that can get input from 
   standard input. The script could also be modified to use temporary files 
   instead of standard input. 
 
+  [2] The gpg-sign-syl script can be found in the 'tools' directory of the 
+  distribution package. 
 
 * Spell checker for Sylpheed-Claws
 -----------------------------------

diff --git a/configure.in b/configure.in
index b63f62d51e1b4f6b2c86d6294fbb059500464568..18db2ecc4e3d2370890b0aae2867281bb55dda6c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws9
+EXTRA_VERSION=claws10
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/tools/gpg-sign b/tools/gpg-sign
deleted file mode 100644 (file)
index a6ae5ab..0000000
--- a/tools/gpg-sign
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-TMPFILE=`mktemp $HOME/.XXXXXX` || exit 1
-cat - > $TMPFILE
-ssh-askpass | gpg --clearsign --no-tty -o - --passphrase-fd 0 $TMPFILE
-rm $TMPFILE

diff --git a/tools/gpg-sign-syl b/tools/gpg-sign-syl
new file mode 100644 (file)
index 0000000..0c7122b
--- /dev/null
+++ b/tools/gpg-sign-syl
@@ -0,0 +1,8 @@
+#!/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