sync with 0.7.8cvs21

diff --git a/COPYING b/COPYING
index c265230db6c9346ce3c593fdc570bc5688724ac2..f3c029eb56752f3ba3a15b3bdb63b2fa26c36ab5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -5,9 +5,6 @@ Portions of those are also copyrighted by Carl Harris, 1993 and 1995.
 Copyright retained for the purpose of protecting free redistribution of
 source.
 
-Kcc is copyright by Yasuhiro Tonooka (tonooka@msi.co.jp),
-and libkcc is copyright by takeshi@SoftAgency.co.jp.
-
 Specific permission is granted for the GPLed code in this distribition to
 be linked to OpenSSL without invoking GPL clause 2(b).
 

diff --git a/ChangeLog b/ChangeLog
index 2e6edc1bbd38d29b6fb4408e25105d2a6367dfff..9deb7069ee378c186bef8fd2e4a95e7c0b915b85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-08
+
+       * libkcc: removed from the source tree.
+       * COPYING
+         src/about.c: removed the copyright notice for libkcc.
+       * src/codeconv.c: conv_guess_encoding(): check for ASCII code first
+         for speedup.
+
 2002-07-05
 
        * src/prefs_actions.c: comply with the coding style.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 45ba53a0c469634afdba6401bd084bee05a372b5..5c300d7cbf5fc57e7ec857c51115b193deda4838 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-07-08 [paul]      0.7.8claws54
+
+       * sync with 0.7.8cvs21
+               see ChangeLog 2002-07-08
+
 2002-07-07 [alfons]    0.7.8claws53
 
        * src/Makefile.am

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 473cad05d1916e564beee86ed2827be119b644c4..9a930a86385f1cd216f81ae1bfd1783b6738dee7 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2002-07-08
+
+       * libkcc: ¥½¡¼¥¹¥Ä¥ê¡¼¤«¤éºï½ü¡£
+       * COPYING
+         src/about.c: libkcc ¤ÎÃøºî¸¢É½¼¨¤òºï½ü¡£
+       * src/codeconv.c: conv_guess_encoding(): ¥¹¥Ô¡¼¥É¥¢¥Ã¥×¤Î¤¿¤á¤Ë
+         ºÇ½é¤Ë ASCII ¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¡£
+
 2002-07-05
 
        * src/prefs_actions.c: ¥³¡¼¥Ç¥£¥ó¥°¥¹¥¿¥¤¥ë¤Ë½àµò¡£

diff --git a/configure.in b/configure.in
index 5ec1c7767efb4fedd221dfa441234c8bf959fa12..1242cc7d10efd927ff888ac42e569d2193c1e2dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws53
+EXTRA_VERSION=claws54
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -245,7 +245,6 @@ if test "$ac_cv_enable_jconv" = yes; then
 fi
 
 AC_CHECK_LIB(xpg4, setlocale)
-dnl AC_CHECK_LIB(kcc, KCC_filter)
 
 dnl for GThread support (currently disabled)
 dnl AC_ARG_ENABLE(threads,
@@ -373,7 +372,6 @@ sylpheed.spec
 intl/Makefile
 ac/Makefile
 po/Makefile.in
-libkcc/Makefile
 src/version.h
 src/Makefile
 faq/Makefile

diff --git a/src/about.c b/src/about.c
index bdbdaf7deb0e954ccfa187d92e22186bc0af263e..dd5faac13dbcbb50f257e7319c05513cc9c2aebb 100644 (file)
--- a/src/about.c
+++ b/src/about.c
@@ -211,10 +211,6 @@ static void about_create(void)
                  "1993 and 1995.  Copyright retained for the purpose of protecting free "
                  "redistribution of source.\n\n"), -1);
 
-       gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
-               _("Kcc is copyright by Yasuhiro Tonooka <tonooka@msi.co.jp>, "
-                 "and libkcc is copyright by takeshi@SoftAgency.co.jp.\n\n"), -1);
-
 #if USE_GPGME
        gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
                _("GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>\n\n"), -1);

diff --git a/src/codeconv.c b/src/codeconv.c
index e5315cbd737a1badd013dbc71627252595932803..ccceb4aa96b4187cb9f5a852c98d7a5b6a272079 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -457,6 +457,8 @@ CharSet conv_guess_encoding(const gchar *str)
                        if (guessed == C_US_ASCII)
                                return C_ISO_2022_JP;
                        p += 2;
+               } else if (isascii(*p)) {
+                       p++;
                } else if (iseuckanji(*p) && iseuckanji(*(p + 1))) {
                        if (*p >= 0xfd && *p <= 0xfe)
                                return C_EUC_JP;