sync with 0.8.10cvs18
authorPaul Mangan <paul@claws-mail.org>
Thu, 27 Feb 2003 15:26:23 +0000 (15:26 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 27 Feb 2003 15:26:23 +0000 (15:26 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/codeconv.c

index e4be97c8cbae06585c5b6b2add3f241745a302c3..47884ce9672c3e6fa290590ad31ad2771d12205e 100644 (file)
--- 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
 2003-02-21
 
        * src/codeconv.c: conv_iconv_strdup(): try to skip invalid characters
index ac5b763d8ada2f6e78a8460a9612395c06e4a422..f0a2a9493e5ace47f30ab432daa0d4e8b4a86fd8 100644 (file)
@@ -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
 2003-02-27 [paul]      0.8.10claws54
 
        * src/addressbook.c
index 43d6f8a7c1f8751844923245163b4a25ea3ecec4..2c019b25a488aac6cc8bd36c9ecbbf50b1cbed29 100644 (file)
@@ -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(): Ìµ¸ú¤Êʸ»ú¤ò¥¹¥­¥Ã¥×¤·¤Æ
 2003-02-21
 
        * src/codeconv.c: conv_iconv_strdup(): Ìµ¸ú¤Êʸ»ú¤ò¥¹¥­¥Ã¥×¤·¤Æ
index f04aeef82e4cadfa2f99746a33ad69c6ee008123..d8280e2a0aee7c27bf974d8f8c48c2efdd165e9f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index f4c662593e8626a97351e061cb82cbfdb7556ad2..00d278814794417e8b85da9bc1f152a8e30d8c47 100644 (file)
@@ -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 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();
                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))
 
        /* don't convert if current codeset is US-ASCII */
        if (!strcasecmp(dest_code, CS_US_ASCII))