force BASE64 encoding for 8-bit text when signing

diff --git a/ChangeLog b/ChangeLog
index 283aea9e506bd493e53f98082ee951a8a453796c..f30b3f5dc7ac73b0415d61b94626b0e851713deb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-19
+
+       * src/compose.c: compose_write_to_file(): force BASE64 encoding for
+         8-bit text when signing (thanks to Colin Leroy).
+
+2002-09-16
+
+       * src/prefs_common.c: prefs_send_create(): fixed the charset string
+         for Cyrillic (Windows-1251).
+
 2002-09-15
 
        * version 0.8.3

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ea770d241db31218f83b6e6d7a899ecce5b66e5c..ac1b888c62b05ea693d9f9a60e69aae0f99d51f9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2002-09-19 [paul]      0.8.2claws59
+
+       * src/prefs_folder_item.c
+               revert to Darko's original alignment of colour
+               selector button
+               add a colon to folder_color label
+               
+       * src/compose.c
+               add Colin's patch (with Hiro's modifications) to 
+               force BASE64 encoding for 8-bit text when signing
+               (sync with 0.8.3cvs2)
+
 2002-09-18 [alfons]    0.8.2claws58
 
        * src/compose.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index c3819cf65e7ab9d4b54f803ca2a0c356e0af7068..873451915a2a9fe74e01830ba609157c7155e3e6 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,13 @@
+2002-09-19
+
+       * src/compose.c: compose_write_to_file(): 8-bit ¥Æ¥­¥¹¥È¤Î½ð̾»þ¤Ë
+         ¤Ï BASE64 ¥¨¥ó¥³¡¼¥É¤ò¶¯À©¤¹¤ë¤è¤¦¤Ë¤·¤¿(Colin Leroy ¤µ¤ó thanks)¡£
+
+2002-09-16
+
+       * src/prefs_common.c: prefs_send_create(): Cyrillic (Windows-1251)
+         ÍѤΠcharset ʸ»úÎó¤ò½¤Àµ¡£
+
 2002-09-15
 
        * version 0.8.3

diff --git a/configure.in b/configure.in
index d1872426a04455d916f878f6f67cfbc6e7ed7ee7..252c6603afd1968c0e52f0c1b5c8c8ea169c24d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws58
+EXTRA_VERSION=claws59
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index db88f4406a83169a8d99139c251ca80a5a3bd493..3bfc03cd062bb3b34a09fab8dfef53c4d9d84018 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3285,6 +3285,13 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                        out_codeset = CS_ISO_8859_1;
                encoding = procmime_get_encoding_for_charset(out_codeset);
 
+#if USE_GPGME
+               if (!is_draft &&
+                   compose->use_signing && !compose->account->clearsign &&
+                   encoding == ENC_8BIT)
+                       encoding = ENC_BASE64;
+#endif
+
                src_codeset = conv_get_current_charset_str();
                /* if current encoding is US-ASCII, set it the same as
                   outgoing one to prevent code conversion failure */