2004-11-06 [colin] 0.9.12cvs140.1
authorColin Leroy <colin@colino.net>
Sat, 6 Nov 2004 20:17:38 +0000 (20:17 +0000)
committerColin Leroy <colin@colino.net>
Sat, 6 Nov 2004 20:17:38 +0000 (20:17 +0000)
* src/compose.c
Sync with HEAD (don't ask passphrase
when drafting)

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

index 6af87d90c4a81ba29c1af1434eeef5d9cdf33150..e14ab1082019d72c4188900f9bbc30be280bd654 100644 (file)
@@ -1,3 +1,9 @@
+2004-11-06 [colin]     0.9.12cvs140.1
+
+       * src/compose.c
+               Sync with HEAD (don't ask passphrase
+               when drafting)
+
 2004-11-06 [paul]      0.9.12cvs139.2
 
        * AUTHORS
index a3b6d4b1f27984f2519df9fefca142dc3782fa16..3e9ea8704ae69cf47425ed098c838bcc9e73ca64 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.57 -r 1.382.2.58 src/compose.c; cvs diff -u -r 1.49.2.16 -r 1.49.2.17 src/procmime.c; ) > 0.9.12cvs139.1.patchset
 ( cvs diff -u -r 1.382.2.58 -r 1.382.2.59 src/compose.c; cvs diff -u -r 1.49.2.17 -r 1.49.2.18 src/procmime.c; ) > 0.9.12cvs139.1.patchset
 ( cvs diff -u -r 1.100.2.5 -r 1.100.2.6 AUTHORS; cvs diff -u -r 1.96.2.25 -r 1.96.2.26 src/textview.c; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/textview.h; ) > 0.9.12cvs139.2.patchset
+( cvs diff -u -r 1.382.2.59 -r 1.382.2.60 src/compose.c; ) > 0.9.12cvs140.1.patchset
index f463cc13d9a173749d06b15ce604109b2b34aab6..e32a3ad10f3cf9ce725ad2b97322117e00f2bae8 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=139
+EXTRA_VERSION=140
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 56a033f8e1420c996392df4ea4a806782ce5d145..ce7674002020eb53ef02e4fcfb24a6ddb55f9591 100644 (file)
@@ -3621,8 +3621,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;