From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 14 Feb 2003 06:44:25 +0000 (+0000)
Subject: sync with 0.8.10cvs11
X-Git-Tag: rel_0_8_11~120
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=92cee8ca51a002cca13cc2926b10ae2bcb5e6509;ds=sidebyside

sync with 0.8.10cvs11
---

diff --git a/ChangeLog b/ChangeLog
index fe1f17020..d53ee51be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-14
+
+	* src/quote_fmt_parse.y: removed gettext translatable strings.
+	* src/unmime.c: unmime_header(): remove broken characters when
+	  code conversion failed.
+	* src/codeconv.c: conv_encode_header(): fixed a bug that broken
+	  headers if long words more than 75 characters are entered.
+
 2003-02-13
 
 	* src/prefs_account.c: prefs_account_receive_create()
diff --git a/ChangeLog.claws b/ChangeLog.claws
index fd90378f9..b6c70b8f8 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-14 [paul]	0.8.10claws10
+
+	* sync with 0.8.10cvs11
+		see ChangeLog 2003-02-14
+
 2003-02-13 [thorsten]	0.8.10claws9
 
 	* src/news.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 4282ae6c5..2fc30f68a 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2003-02-14
+
+	* src/quote_fmt_parse.y: gettext ËÝÌõ²Äǽ¤Êʸ»úÎó¤òºï½ü¡£
+	* src/unmime.c: unmime_header(): ¥³¡¼¥ÉÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¤È¤­¤Ï²õ¤ì¤¿
+	  ʸ»ú¤òºï½ü¡£
+	* src/codeconv.c: conv_encode_header(): 75 ʸ»ú°Ê¾å¤ÎŤ¤Ã±¸ì¤¬
+	  ÆþÎϤµ¤ì¤ë¤È¥Ø¥Ã¥À¤ò²õ¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ¡£
+
 2003-02-13
 
 	* src/codeconv.c: isprintableeuckanji(): 1¥Ð¥¤¥ÈÌÜ¤Ç 0xf4 ¤òĶ¤¨¤ë
diff --git a/configure.ac b/configure.ac
index 3c9a8b165..cc6e8a60e 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=claws9
+EXTRA_VERSION=claws10
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/codeconv.c b/src/codeconv.c
index 747ac71e4..fa1bb18b1 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1234,14 +1234,16 @@ void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
 	}							\
 								\
 	if ((cond) && *srcp) {					\
-		if (destp > dest && isspace(*(destp - 1)))	\
-			destp--;				\
-		else if (plaintext && isspace(*srcp))		\
-			srcp++;					\
-		if (destp > dest && *srcp) {			\
-			*destp++ = '\n';			\
-			*destp++ = ' ';				\
-			left = MAX_LINELEN - 1;			\
+		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;		\
+			}					\
 		}						\
 	}							\
 }
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 49939373d..13cb1aaca 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -27,7 +27,6 @@
 #include "procmsg.h"
 #include "procmime.h"
 #include "utils.h"
-#include "intl.h"
 #include "procheader.h"
 
 #include "quote_fmt.h"
diff --git a/src/unmime.c b/src/unmime.c
index 8649f4732..dc2b4f470 100644
--- a/src/unmime.c
+++ b/src/unmime.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ void unmime_header(gchar *out, const gchar *str)
 			g_free(conv_str);
 		} else {
 			len = strlen(decoded_text);
-			memcpy(outp, decoded_text, len);
+			conv_localetodisp(outp, len + 1, decoded_text);
 		}
 		outp += len;