2004-11-06 [colin] 0.9.12cvs140
authorColin Leroy <colin@colino.net>
Sat, 6 Nov 2004 19:42:27 +0000 (19:42 +0000)
committerColin Leroy <colin@colino.net>
Sat, 6 Nov 2004 19:42:27 +0000 (19:42 +0000)
* src/compose.c
Don't ask for passphrase if not sending

ChangeLog.claws
PATCHSETS
configure.ac
src/compose.c

index aa0b7ae..f405d32 100644 (file)
@@ -1,3 +1,8 @@
+2004-11-06 [colin]     0.9.12cvs140
+
+       * src/compose.c
+               Don't ask for passphrase if not sending
+
 2004-11-05 [christoph] 0.9.12cvs139
 
        * src/compose.c
index f4c5a46..102edd2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.89 -r 1.90 src/procmime.c; ) > 0.9.12cvs137.patchset
 ( cvs diff -u -r 1.74 -r 1.75 po/POTFILES.in; cvs diff -u -r 1.4 -r 1.5 src/prefs_ext_prog.c; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs138.patchset
 ( cvs diff -u -r 1.3087 -r 1.3088 ChangeLog.claws; cvs diff -u -r 1.451 -r 1.452 src/compose.c; cvs diff -u -r 1.90 -r 1.91 src/procmime.c; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/README; ) > 0.9.12cvs139.patchset
+( cvs diff -u -r 1.452 -r 1.453 src/compose.c; ) > 0.9.12cvs140.patchset
index 66a4dcd..d2ba0d9 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=139
+EXTRA_VERSION=140
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 8363fa0..841b80a 100644 (file)
@@ -3444,8 +3444,9 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        } else
                g_node_append(mimemsg->node, mimetext->node);
 
-       /* sign message */
-       if (compose->use_signing && privacy_system_can_sign(compose->privacy_system))
+       /* sign message if sending */
+       if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && 
+           privacy_system_can_sign(compose->privacy_system))
                if (!privacy_sign(compose->privacy_system, mimemsg))
                        return -1;