From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 27 Feb 2003 15:26:23 +0000 (+0000)
Subject: sync with 0.8.10cvs18
X-Git-Tag: rel_0_8_11~67
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=aba16647cbf502ebed2fe7aba2dc316102415276

sync with 0.8.10cvs18
---

diff --git a/ChangeLog b/ChangeLog
index e4be97c8c..47884ce96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-27
+
+	* src/codeconv.c: conv_codeset_strdup(): don't convert if current
+	  codeset is US-ASCII (or POSIX).
+
 2003-02-21
 
 	* src/codeconv.c: conv_iconv_strdup(): try to skip invalid characters
diff --git a/ChangeLog.claws b/ChangeLog.claws
index ac5b763d8..f0a2a9493 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-27 [paul]	0.8.10claws55
+
+	* sync with 0.8.10cvs18
+		see ChangeLog 2003-02-27
+
 2003-02-27 [paul]	0.8.10claws54
 
 	* src/addressbook.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 43d6f8a7c..2c019b25a 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2003-02-27
+
+	* src/codeconv.c: conv_codeset_strdup(): ¸½ºß¤Î¥³¡¼¥É¥»¥Ã¥È¤¬
+	  US-ASCII (¤Þ¤¿¤Ï POSIX) ¤Î¾ì¹ç¤ÏÊÑ´¹¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
 2003-02-21
 
 	* src/codeconv.c: conv_iconv_strdup(): ̵¸ú¤Êʸ»ú¤ò¥¹¥­¥Ã¥×¤·¤Æ
diff --git a/configure.ac b/configure.ac
index f04aeef82..d8280e2a0 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=claws54
+EXTRA_VERSION=claws55
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/codeconv.c b/src/codeconv.c
index f4c662593..00d278814 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -699,11 +699,8 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 #if HAVE_ICONV
 	if (!src_code)
 		src_code = conv_get_outgoing_charset_str();
-	if (!dest_code) {
+	if (!dest_code)
 		dest_code = conv_get_current_charset_str();
-		if (!strcasecmp(dest_code, CS_US_ASCII))
-			dest_code = CS_ISO_8859_1;
-	}
 
 	/* don't convert if current codeset is US-ASCII */
 	if (!strcasecmp(dest_code, CS_US_ASCII))