From: Thorsten Maerz <torte@netztorte.de>
Date: Fri, 17 Dec 2004 18:13:47 +0000 (+0000)
Subject: 2004-12-17 [thorsten]	0.9.13cvs20
X-Git-Tag: rel_1_0_0~28
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6be4c877b56e703f0d15a0be8c8b70ca3ac6d409

2004-12-17 [thorsten]	0.9.13cvs20

	* src/compose.c
		protect trailing spaces when signing message
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 813166807..6a12bc782 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-12-17 [thorsten]	0.9.13cvs20
+
+	* src/compose.c
+		protect trailing spaces when signing message
+
 2004-12-16 [paul]	0.9.13cvs19
 
 	* ChangeLog
diff --git a/PATCHSETS b/PATCHSETS
index 45da54070..3de0892a8 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -189,3 +189,4 @@
 ( cvs diff -u -r 1.7 -r 1.8 src/gtk/gtkutils.c; cvs diff -u -r 1.6 -r 1.7 src/gtk/gtkutils.h; cvs diff -u -r 1.18 -r 1.19 src/gtk/prefswindow.c; ) > 0.9.13cvs17.patchset
 ( cvs diff -u -r 1.19 -r 1.20 src/gtk/prefswindow.c; ) > 0.9.13cvs18.patchset
 ( cvs diff -u -r 1.450 -r 1.451 ChangeLog; cvs diff -u -r 1.445 -r 1.446 ChangeLog.jp; cvs diff -u -r 1.53 -r 1.54 NEWS; cvs diff -u -r 1.464 -r 1.465 src/compose.c; cvs diff -u -r 1.16 -r 1.17 src/syldap.c; ) > 0.9.13cvs19.patchset
+( cvs diff -u -r 1.465 -r 1.466 src/compose.c; ) > 0.9.13cvs20.patchset
diff --git a/configure.ac b/configure.ac
index c9fcc6993..7be37855e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/compose.c b/src/compose.c
index fd1eacafd..d05a37901 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3465,6 +3465,10 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
 	mimetext->subtype = g_strdup("plain");
 	g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
 			    g_strdup(out_codeset));
+	/* protect trailing spaces when signing message */
+	if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && 
+	    privacy_system_can_sign(compose->privacy_system))
+		encoding = ENC_QUOTED_PRINTABLE;
 	if (encoding != ENC_UNKNOWN)
 		procmime_encode_content(mimetext, encoding);