From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 5 Mar 2003 07:49:43 +0000 (+0000)
Subject: sync with 0.8.10cvs23
X-Git-Tag: rel_0_8_11~39
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4d9efc939f2b4dc6bf60275402ded42db480eee9

sync with 0.8.10cvs23
---

diff --git a/ChangeLog b/ChangeLog
index e4bbb9a3d..1074848f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-03-05
+
+	* src/codeconv.c: conv_encode_header(): fixed a bug that spaces
+	  which is on the wrap boundary would be lost when encoding long
+	  non-ascii strings (thanks to Sergey Vlasov).
+	  Don't force wrapping within a long word until it reaches hard line
+	  length limit (998 characters) (workaround for the breakage of
+	  long address list with no spaces).
+
+2003-03-03
+
+	* src/prefs_account.c: fixed compile failure when using neither
+	  gpg or ssl.
+
 2003-03-03
 
 	* src/codeconv.c: fixed UTF-8 locale support.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index e411893e9..c651aaf56 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-03-05 [paul]	0.8.10claws82
+
+	* sync with 0.8.10cvs23
+		see ChangeLog 2003-03-05
+
 2003-03-04 [christoph]	0.8.10claws81
 
 	* src/folder.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index f3c610897..c5b749656 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,17 @@
+2003-03-05
+
+	* src/codeconv.c: conv_encode_header(): Ť¤Èó ASCII ʸ»úÎó¤ò
+	  ¥¨¥ó¥³¡¼¥É¤¹¤ë¤È¤­¤ËÀÞ¤êÊÖ¤·¶­³¦¤Ë¤¢¤ë¶õÇò¤¬¼º¤ï¤ì¤ë¥Ð¥°¤ò½¤Àµ
+	  (Sergey Vlasov ¤µ¤ó thanks)¡£
+	  ¥Ï¡¼¥É¹ÔĹÀ©¸Â(998ʸ»ú)¤Ë¤«¤«¤ë¤Þ¤ÇŤ¤Ã±¸ìÃæ¤Ç¶¯À©Åª¤ËÀÞ¤êÊÖ
+	  ¤µ¤Ê¤¤¤è¤¦¤Ë¤·¤¿(¶õÇò¤Î¤Ê¤¤Ä¹¤¤¥¢¥É¥ì¥¹¥ê¥¹¥È¤¬²õ¤ì¤ëÌäÂê¤Ø¤Î
+	  Âнè)¡£
+
+2003-03-03
+
+	* src/prefs_account.c: gpg ¤â ssl ¤â»ÈÍѤ·¤Ê¤¤¾ì¹ç¤Ë¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ
+	  ¤¹¤ë¤Î¤ò½¤Àµ¡£
+
 2003-03-03
 
 	* src/codeconv.c: UTF-8 locale Âбþ¤ò½¤Àµ¡£
diff --git a/configure.ac b/configure.ac
index 5690f3fb7..8344150ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws81
+EXTRA_VERSION=claws82
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/codeconv.c b/src/codeconv.c
index db8ec79c8..15c3a5f3b 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1217,32 +1217,33 @@ void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
 		unmime_header(outbuf, str);
 }
 
-#define MAX_LINELEN	76
-#define MIMESEP_BEGIN	"=?"
-#define MIMESEP_END	"?="
+#define MAX_LINELEN		76
+#define MAX_HARD_LINELEN	996
+#define MIMESEP_BEGIN		"=?"
+#define MIMESEP_END		"?="
 
 #define B64LEN(len)	((len) / 3 * 4 + ((len) % 3 ? 4 : 0))
 
-#define LBREAK_IF_REQUIRED(cond, plaintext)			\
-{								\
-	if (len - (destp - dest) < MAX_LINELEN + 2) {		\
-		*destp = '\0';					\
-		return;						\
-	}							\
-								\
-	if ((cond) && *srcp) {					\
-		if (destp > dest && left < MAX_LINELEN - 1) {	\
-			if (isspace(*(destp - 1)))		\
-				destp--;			\
-			else if (plaintext && isspace(*srcp))	\
-				srcp++;				\
-			if (*srcp) {				\
-				*destp++ = '\n';		\
-				*destp++ = ' ';			\
-				left = MAX_LINELEN - 1;		\
-			}					\
-		}						\
-	}							\
+#define LBREAK_IF_REQUIRED(cond, is_plain_text)				\
+{									\
+	if (len - (destp - dest) < MAX_LINELEN + 2) {			\
+		*destp = '\0';						\
+		return;							\
+	}								\
+									\
+	if ((cond) && *srcp) {						\
+		if (destp > dest && left < MAX_LINELEN - 1) {		\
+			if (isspace(*(destp - 1)))			\
+				destp--;				\
+			else if (is_plain_text && isspace(*srcp))	\
+				srcp++;					\
+			if (*srcp) {					\
+				*destp++ = '\n';			\
+				*destp++ = ' ';				\
+				left = MAX_LINELEN - 1;			\
+			}						\
+		}							\
+	}								\
 }
 
 void conv_encode_header(gchar *dest, gint len, const gchar *src,
@@ -1293,7 +1294,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 			word_len = get_next_word_len(srcp);
 			LBREAK_IF_REQUIRED(left < word_len, TRUE);
 			while (word_len > 0) {
-				LBREAK_IF_REQUIRED(left + 22 <= 0, TRUE);
+				LBREAK_IF_REQUIRED(left + (MAX_HARD_LINELEN - MAX_LINELEN) <= 0, TRUE)
 				*destp++ = *srcp++;
 				left--;
 				word_len--;