From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 4 Dec 2003 06:10:04 +0000 (+0000)
Subject: sync with 0.9.7cvs6
X-Git-Tag: rel_0_9_8~43
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5b9b8bac5e64a3eadfbcfd8879a5b3ef250fadb0

sync with 0.9.7cvs6
---

diff --git a/ChangeLog b/ChangeLog
index 3077bf775..fdfffeb96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2003-12-04
+
+	* src/codeconv.c: conv_get_code_conv_func(): return conv_latintodisp
+	  only if src_charset and current charset is identical or current
+	  one is multibyte (fixes display of ISO-8859-5 on KOI8-R locale etc.).
+
+2003-11-25
+
+	* autogen.sh: don't include m4 directory in aclocal.
+	* intl/libgnuintl.h: removed from cvs.
+	* po/.cvsignore: added stamp-po and remove-potcdate.sed.
+
+2003-11-24
+
+	* upgraded to gettext-0.12.1.
+
+2003-11-24  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.am (SUBDIRS): Add m4.
+	(ACLOCAL_AMFLAGS): New variable.
+	(EXTRA_DIST): Add config.rpath.
+	* configure.in (AC_OUTPUT): Add m4/Makefile.
+
 2003-11-21
 
 	* configure.in: added check for d_type member in struct dirent.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 769ff50ac..02ecc4f8a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-12-04 [paul]	0.9.7claws19
+
+	* sync with 0.9.7cvs6
+		see ChangeLog 2003-12-04
+
 2003-12-04 [paul]	0.9.7claws18
 
 	* po/POTFILES.in
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 09504b82f..20be4dc7d 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,20 @@
+2003-12-04
+
+	* src/codeconv.c: conv_get_code_conv_func(): src_charset ¤È¸½ºß¤Î
+	  ʸ»ú¥³¡¼¥É¤¬Æ±°ì¤Î¾ì¹ç¡¢¤Þ¤¿¤Ï¸½ºß¤Îʸ»ú¥³¡¼¥É¤¬¥Þ¥ë¥Á¥Ð¥¤¥È¤Ç
+	  ¤¢¤ë¾ì¹ç¤Î¤ß conv_latintodisp ¤òÊÖ¤¹(KOI8-R locale ¾å¤Ç¤Î
+	  ISO-8859-5 ¤Îɽ¼¨¤ò½¤Àµ)¡£
+
+2003-11-25
+
+	* autogen.sh: aclocal ¤Ç m4 ¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤Þ¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+	* intl/libgnuintl.h: cvs ¤«¤éºï½ü¡£
+	* po/.cvsignore: stamp-po ¤È remove-potcdate.sed ¤òÄɲá£
+
+2003-11-24
+
+	* gettext-0.12.1 ¤Ë°Ü¹Ô¡£
+
 2003-11-21
 
 	* configure.in: struct dirent Ãæ¤Î d_type ¥á¥ó¥Ð¤Î¥Á¥§¥Ã¥¯¤òÄɲá£
diff --git a/configure.ac b/configure.ac
index 49ab44938..866e0d1a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/codeconv.c b/src/codeconv.c
index 0357f2a1e..2546c8a0c 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -767,7 +767,9 @@ CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
 	case C_ISO_8859_13:
 	case C_ISO_8859_14:
 	case C_ISO_8859_15:
-		if (dest_charset == C_AUTO)
+		if (dest_charset == C_AUTO &&
+		    (conv_get_current_charset() == src_charset ||
+		     MB_CUR_MAX > 1))
 			code_conv = conv_latintodisp;
 		break;
 	case C_SHIFT_JIS: