From e76bf3e452d69b606067dbd1fbe8c64b0e2bf8a1 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 31 Jan 2005 07:07:05 +0000
Subject: replace every non-UTF8 8bit character in the source window etc.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@58 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog      | 5 +++++
 ChangeLog.ja   | 5 +++++
 src/codeconv.c | 5 ++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1c430516..1cc18fce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-31
+
+	* src/codeconv.c: conv_utf8todisp(): replace every 8bit character
+	  if the source string is not a valid UTF-8.
+
 2005-01-31
 
 	* src/defs.h: use original ".sylpheed_cache" for CACHE_FILE.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 18c265e9..49029d9c 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-01-31
+
+	* src/codeconv.c: conv_utf8todisp(): ソース文字列が有効な UTF-8
+	  でなければ全ての 8bit 文字を置換するようにした。
+
 2005-01-31
 
 	* src/defs.h: CACHE_FILE に元の ".sylpheed_cache" を使用。
diff --git a/src/codeconv.c b/src/codeconv.c
index 47404702..32b3918f 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -788,7 +788,10 @@ static void conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
 
 void conv_utf8todisp(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
-	strncpy2(outbuf, inbuf, outlen);
+	if (g_utf8_validate(inbuf, -1, NULL) == TRUE)
+		strncpy2(outbuf, inbuf, outlen);
+	else
+		conv_ustodisp(outbuf, outlen, inbuf);
 }
 
 static void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
-- 
cgit v1.2.3