sync with 0.8.0cvs1

diff --git a/ChangeLog b/ChangeLog
index 8800ac48bd17200311262983d81bfcd4a4b7f107..c257c900715e9199cc9d31a6489c13894e86d33a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-23
+
+       * src/utils.c: remove_numbered_files(): don't try to unlink()
+         directories.
+       * src/codeconv.c:
+         conv_get_code_conv_func(): return conv_anytodisp() if charset is
+         not specified.
+         conv_unmime_header_overwrite()
+         conv_unmime_header(): do conv_anytodisp() before decoding header.
+
 2002-07-14
 
        * version 0.8.0

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5102f8d1d56422a7af1b2d1f04ae91dd5af13220..19d2d631bd87e09a4697e0594d0f015548db6eaa 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-07-23 [paul]      0.8.0claws1
+
+       * sync with 0.8.0cvs1
+               see ChangeLog 2002-07-23
+
 2002-07-23 [paul]      0.8.0claws
 
        * release of 0.8.0claws

diff --git a/ChangeLog.jp b/ChangeLog.jp
index a2a307b258a5aed2ba68a1ef0916de25db6b86e8..c75879c0c1e3b991227650dab39daabdf38b28e5 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,14 @@
+2002-07-23
+
+       * src/utils.c: remove_numbered_files(): ¥Ç¥£¥ì¥¯¥È¥ê¤ò unlink()
+         ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+       * src/codeconv.c:
+         conv_get_code_conv_func(): charset ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð
+         conv_anytodisp() ¤òÊÖ¤¹¤è¤¦¤Ë¤·¤¿¡£
+         conv_unmime_header_overwrite()
+         conv_unmime_header(): ¥Ø¥Ã¥À¤ò¥Ç¥³¡¼¥É¤¹¤ëÁ°¤Ë conv_anytodisp()
+         ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2002-07-14
 
        * version 0.8.0

diff --git a/configure.in b/configure.in
index dd9cdecfb977cac4493cedef203a1b782668da8c..47bb21a5856631a4e87105b07d553219bf32a235 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws
+EXTRA_VERSION=claws1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/codeconv.c b/src/codeconv.c
index 320f9b5be03048967001df776701dbdcfe9ef8dc..b43d55a376eb9de65291d6adc18c277def5f26f0 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -588,7 +588,9 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 
                func = conv_get_code_conv_func(src_codeset);
                if (func != conv_noconv) {
-                       if (func == conv_jistodisp || func == conv_sjistodisp)
+                       if (func == conv_jistodisp ||
+                           func == conv_sjistodisp ||
+                           func == conv_anytodisp)
                                len = strlen(inbuf) * 2 + 1;
                        else
                                len = strlen(inbuf) + 1;
@@ -663,10 +665,12 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 CodeConvFunc conv_get_code_conv_func(const gchar *charset)
 {
        CodeConvFunc code_conv;
+       CharSet cur_charset;
 
        if (!charset) {
-               if (conv_get_outgoing_charset() == C_ISO_2022_JP)
-                       return conv_jistodisp;
+               cur_charset = conv_get_current_charset();
+               if (cur_charset == C_EUC_JP || cur_charset == C_SHIFT_JIS)
+                       return conv_anytodisp;
                else
                        return conv_noconv;
        }
@@ -984,32 +988,39 @@ const gchar *conv_get_current_locale(void)
 void conv_unmime_header_overwrite(gchar *str)
 {
        gchar *buf;
-       gint outlen;
+       gint buflen;
        CharSet cur_charset;
 
        cur_charset = conv_get_current_charset();
 
-       outlen = strlen(str) + 1;
-       Xalloca(buf, outlen, return);
-       unmime_header(buf, str);
-       if (cur_charset == C_EUC_JP)
-               conv_jistodisp(str, outlen, buf);
-       else
-               strncpy2(str, buf, outlen);
+       if (cur_charset == C_EUC_JP) {
+               buflen = strlen(str) * 2 + 1;
+               Xalloca(buf, buflen, return);
+               conv_anytodisp(buf, buflen, str);
+               unmime_header(str, buf);
+       } else {
+               buflen = strlen(str) + 1;
+               Xalloca(buf, buflen, return);
+               unmime_header(buf, str);
+               strncpy2(str, buf, buflen);
+       }
 }
 
 void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
                        const gchar *charset)
 {
-       gchar *buf;
        CharSet cur_charset;
 
        cur_charset = conv_get_current_charset();
 
        if (cur_charset == C_EUC_JP) {
-               Xalloca(buf, outlen, return);
-               unmime_header(buf, str);
-               conv_jistodisp(outbuf, outlen, buf);
+               gchar *buf;
+               gint buflen;
+
+               buflen = strlen(str) * 2 + 1;
+               Xalloca(buf, buflen, return);
+               conv_anytodisp(buf, buflen, str);
+               unmime_header(outbuf, buf);
        } else
                unmime_header(outbuf, str);
 }

diff --git a/src/utils.c b/src/utils.c
index bebbca2f78ee3e92185a96984931eb26d691caef..4d33b92bd74626de2013f129c85ce72e729dac32 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1727,6 +1727,8 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        while ((d = readdir(dp)) != NULL) {
                fileno = to_number(d->d_name);
                if (fileno >= 0 && first <= fileno && fileno <= last) {
+                       if (is_dir_exist(d->d_name))
+                               continue;
                        if (unlink(d->d_name) < 0)
                                FILE_OP_ERROR(d->d_name, "unlink");
                }