From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 19 Sep 2002 11:06:07 +0000 (+0000)
Subject: force BASE64 encoding for 8-bit text when signing
X-Git-Tag: rel_0_8_3~12
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f9a9168099e402d39f2f245ef110cf48e877f641

force BASE64 encoding for 8-bit text when signing
---

diff --git a/ChangeLog b/ChangeLog
index 283aea9e5..f30b3f5dc 100644
--- 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 ea770d241..ac1b888c6 100644
--- 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 c3819cf65..873451915 100644
--- 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 d1872426a..252c6603a 100644
--- 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 db88f4406..3bfc03cd0 100644
--- 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 */