From 59fec1a41558d2b97f4f3a8725d759a009820650 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 28 Oct 2002 08:29:39 +0000
Subject: [PATCH] sync with 0.8.5cvs15

---
 ChangeLog       | 27 +++++++++++++++++++++++++++
 ChangeLog.claws |  7 +++++++
 ChangeLog.jp    | 27 +++++++++++++++++++++++++++
 configure.in    |  2 +-
 src/codeconv.c  |  6 ++++++
 src/html.c      |  4 +---
 src/html.h      |  1 +
 7 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b85f4c2f6..442057cd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2002-10-28
+
+	* src/codeconv.c: conv_euctojis(): fixed a bug which will cause
+	  infinite loop if a invalid code appeared.
+
+2002-10-25
+
+	* src/codeconv.c: conv_codeset_strdup()
+	  src/html.[ch]: html_read_line(): don't output conversion failure
+	  warnings.
+	  Added HTML_CONV_FAILED to the enum HTMLState.
+
+2002-10-24
+
+	* implemented per-folder auto-set address (still in progress).
+	* src/compose.[ch]: compose_new(): added FolderItem to its arguments,
+	  and set entries from it (if mailto is empty).
+	  compose_entry_append(): activate menu if required.
+	  compose_entries_set_from_item(): new.
+	* src/folder.[ch]: added auto_to, use_auto_to_on_reply, auto_cc,
+	  auto_bcc, and auto_replyto to FolderItem, and renamed apply_sub to
+	  ac_apply_sub.
+	  folder_build_tree(), folder_read_folder_func(),
+	  folder_write_list_recursive(): added the above members.
+	* src/prefs_folder_item.[ch]: added auto-set addresses.
+	* src/pop.[ch]: removed Pop3State::prev_folder.
+
 2002-10-11
 
 	* src/compose.c: allow dropping files by also "moving" files from a
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 178909457..8921a0562 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-10-28 [paul]	0.8.5claws57
+
+	* sync with 0.8.5cvs15
+		see ChangeLog 2002-10-28 and 2002-10-25
+		
+	Note: ChangeLog entry 2002-10-24 is not sync'ed.
+
 2002-10-27 [oliver]	0.8.5claws56
 
 	* src/pop.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 1e5afcba4..12892e52c 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,30 @@
+2002-10-28
+
+	* src/codeconv.c: conv_euctojis(): ÉÔÀµ¤Ê¥³¡¼¥É¤¬½Ð¸½¤·¤¿¤é̵¸Â
+	  ¥ë¡¼¥×¤Ë´Ù¤ë¥Ð¥°¤ò½¤Àµ¡£
+
+2002-10-25
+
+	* src/codeconv.c: conv_codeset_strdup()
+	  src/html.[ch]: html_read_line(): ÊÑ´¹¼ºÇԤηٹð¤ò½Ð¤µ¤Ê¤¤¤è¤¦¤Ë
+	  ¤·¤¿¡£
+	  enum HTMLState ¤Ë HTML_CONV_FAILED ¤òÄɲá£
+
+2002-10-24
+
+	* ¥Õ¥©¥ë¥ÀËè¤Î¼«Æ°»ØÄꥢ¥É¥ì¥¹¤ò¼ÂÁõ(¤Þ¤Àºî¶ÈÃæ)¡£
+	* src/compose.[ch]: compose_new(): °ú¿ô¤Ë FolderItem ¤òÄɲä·¡¢
+	  (mailto ¤¬¶õ¤Ç¤¢¤ì¤Ð)¤½¤ì¤«¤é¥¨¥ó¥È¥ê¤òÀßÄê¡£
+	  compose_entry_append(): ɬÍפǤ¢¤ì¤Ð¥á¥Ë¥å¡¼¤òÍ­¸ú¤Ë¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+	  compose_entries_set_from_item(): ¿·µ¬¡£
+	* src/folder.[ch]: auto_to, use_auto_to_on_reply, auto_cc, auto_bcc,
+	  auto_replyto ¤ò FolderItem ¤ËÄɲä·¡¢ apply_sub ¤ò ac_apply_sub
+	  ¤Ë̾¾ÎÊѹ¹¡£
+	  folder_build_tree(), folder_read_folder_func(),
+	  folder_write_list_recursive(): ¾åµ­¥á¥ó¥Ð¤òÄɲá£
+	* src/prefs_folder_item.[ch]: ¼«Æ°»ØÄꥢ¥É¥ì¥¹¤òÄɲá£
+	* src/pop.[ch]: Pop3State::prev_folder ¤òºï½ü¡£
+
 2002-10-11
 
 	* src/compose.c: ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤«¤é¥Õ¥¡¥¤¥ë¤ò¡Ö°ÜÆ°¡×¤¹¤ë¤³¤È¤Ç
diff --git a/configure.in b/configure.in
index a8ee10f20..c81c17a5b 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws56
+EXTRA_VERSION=claws57
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/codeconv.c b/src/codeconv.c
index 83df42bb2..f0c072256 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -231,6 +231,10 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
 					}
 				}
 			}
+		} else {
+			K_OUT();
+			*out++ = SUBST_CHAR;
+			in++;
 		}
 	}
 
@@ -626,9 +630,11 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 	    == 0)
 		return buf;
 	else {
+#if 0
 		g_warning("code conversion from %s to %s failed\n",
 			  codesets && codesets[0] ? codesets[0] : "(unknown)",
 			  dest_codeset);
+#endif /* 0 */
 		return NULL;
 	}
 #else /* !HAVE_LIBJCONV */
diff --git a/src/html.c b/src/html.c
index fddb65338..9758d6e1f 100644
--- a/src/html.c
+++ b/src/html.c
@@ -451,15 +451,13 @@ static HTMLState html_read_line(HTMLParser *parser)
 	}
 
 	if (conv_convert(parser->conv, buf2, sizeof(buf2), buf) < 0) {
-		g_warning("html_read_line(): code conversion failed\n");
-
 		index = parser->bufp - parser->buf->str;
 
 		g_string_append(parser->buf, buf);
 
 		parser->bufp = parser->buf->str + index;
 
-		return HTML_ERR;
+		return HTML_CONV_FAILED;
 	}
 
 	index = parser->bufp - parser->buf->str;
diff --git a/src/html.h b/src/html.h
index 41853b582..5b17dc222 100644
--- a/src/html.h
+++ b/src/html.h
@@ -36,6 +36,7 @@ typedef enum
 	HTML_FONT,
 	HTML_PRE,
 	HTML_UNKNOWN,
+	HTML_CONV_FAILED,
 	HTML_ERR,
 	HTML_EOF
 } HTMLState;
-- 
2.25.1