2004-08-21 [colin] 0.9.12cvs70

	* src/compose.c
		When using inline encryption, don't use QP or Base64:
		the mail will be encrypted to a 7bit string.
		Fixes bug 197

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 393e3ada699ed298ce653521839c155d9ae2544c..67633d301d912d628786873e36e3e9152925e582 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2004-08-21 [colin]     0.9.12cvs70
+
+       * src/compose.c
+               When using inline encryption, don't use QP or Base64:
+               the mail will be encrypted to a 7bit string.
+               Fixes bug 197
+
 2004-08-21 [colin]     0.9.12cvs69
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index dd5bb709eb3392ccdef88ea317641c5541b4a5b0..06e04a854886d78f8e7681023bff17390db2304d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -52,3 +52,4 @@
 ( cvs diff -u -r 1.305 -r 1.306 src/mainwindow.c; ) > 0.9.12cvs67.patchset
 ( cvs diff -u -r 1.433 -r 1.434 src/compose.c; ) > 0.9.12cvs68.patchset
 ( cvs diff -u -r 1.434 -r 1.435 src/compose.c; ) > 0.9.12cvs69.patchset
+( cvs diff -u -r 1.435 -r 1.436 src/compose.c; ) > 0.9.12cvs70.patchset

diff --git a/configure.ac b/configure.ac
index ccff7182a2f9fd8f75a7c5fa5bca6f00a08d76a5..83b3c08601f48f4ae541b5a1cd9b3600f8d57c1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 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 839e65fc65af3d4ee851c699d9850410e46a3ecf..f94ee2a93dd47fb16c6d532ccf1a4f5b8b364752 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3557,6 +3557,9 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                    compose->use_signing && !compose->gnupg_mode &&
                    encoding == ENC_8BIT)
                        encoding = ENC_BASE64;
+               
+               if (compose->use_encryption && compose->gnupg_mode)
+                       encoding = ENC_8BIT; /* this will be encrypted to a 7bit string */
 #endif
 
                src_codeset = conv_get_current_charset_str();