From 80bfa484ce06bd167ac32fca7ab3115c993cd254 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 1 May 2003 10:03:20 +0000
Subject: [PATCH] sync with 0.8.11cvs38

---
 ChangeLog       | 13 +++++++++++++
 ChangeLog.claws |  5 +++++
 ChangeLog.jp    | 14 ++++++++++++++
 configure.ac    |  2 +-
 src/action.c    | 18 +++++++++---------
 src/codeconv.c  |  9 ++++++---
 6 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc0157b40..0fceb82f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-05-01
+
+	* src/codeconv.c: conv_get_code_conv_func(): convert to EUC-JP only
+	  if it is the current locale encoding when dest_charset_str is NULL.
+
+2003-05-01
+
+	* src/action.c: execute_actions(): fixed crash when no text widget
+	  is selected.
+	* src/action.c
+	  src/prefs_actions.c: added missing reference to Claws team in the
+	  copyright.
+
 2003-04-28
 
 	* src/session.c:
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 58ca86a5d..819e046b2 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-05-01 [paul]	0.8.11claws137
+
+	* sync with 0.8.11cvs38
+		see ChangeLog 2003-05-01
+
 2003-05-01 [paul]	0.8.11claws136
 
 	* po/bg.po
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 48e848855..dcf409515 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,17 @@
+2003-05-01
+
+	* src/codeconv.c: conv_get_code_conv_func(): dest_charset_str ¤¬ NULL
+	  ¤Î¤È¤­¡¢¸½ºß¤Î locale ¤¬ EUC-JP ¤Î¾ì¹ç¤Î¤ß EUC-JP ¤ËÊÑ´¹¤¹¤ë¤è¤¦¤Ë
+	  ¤·¤¿¡£
+
+2003-05-01
+
+	* src/action.c: execute_actions(): ¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤¬Ì¤ÁªÂò¤Î
+	  ¾ì¹ç¥¯¥é¥Ã¥·¥å¤¹¤ë¤Î¤ò½¤Àµ¡£
+	* src/action.c
+	  src/prefs_actions.c: Ãøºî¸¢É½¼¨¤Ë Claws ¥Á¡¼¥à¤Îɽ¼¨¤¬¤Ê¤«¤Ã¤¿¤Î¤Ç
+	  Äɲá£
+
 2003-04-28
 
 	* src/session.c:
diff --git a/configure.ac b/configure.ac
index b84608adb..c3ffb18ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws136
+EXTRA_VERSION=claws137
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/action.c b/src/action.c
index 04d605dd8..3c0701eba 100644
--- a/src/action.c
+++ b/src/action.c
@@ -601,21 +601,21 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
 			if (start == end) {
 				start = body_pos;
 				end = gtk_stext_get_length(GTK_STEXT(text));
-				msg_str = gtk_editable_get_chars(GTK_EDITABLE(text),
-							 start, end);
+				msg_str = gtk_editable_get_chars
+					(GTK_EDITABLE(text), start, end);
 			} else {
-				sel_str = gtk_editable_get_chars(GTK_EDITABLE(text),
-							 	 start, end);
-			msg_str = g_strdup(sel_str);
+				sel_str = gtk_editable_get_chars
+					(GTK_EDITABLE(text), start, end);
+				msg_str = g_strdup(sel_str);
 			}
-		}  else {
+		} else {
 			start = body_pos;
 			end = gtk_stext_get_length(GTK_STEXT(text));
 			msg_str = gtk_editable_get_chars(GTK_EDITABLE(text),
-						 start, end);
-		} 
+							 start, end);
+		}
 	}
-	
+
 	if (action_type & ACTION_USER_STR) {
 		if (!(user_str = get_user_string(action, ACTION_USER_STR))) {
 			g_free(msg_str);
diff --git a/src/codeconv.c b/src/codeconv.c
index 50990d8cf..01bcf6fe5 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -743,7 +743,8 @@ CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
 	switch (src_charset) {
 	case C_ISO_2022_JP:
 	case C_ISO_2022_JP_2:
-		if (dest_charset == C_AUTO)
+		if (dest_charset == C_AUTO &&
+		    conv_get_current_charset() == C_EUC_JP)
 			code_conv = conv_jistodisp;
 		else if (dest_charset == C_EUC_JP)
 			code_conv = conv_jistoeuc;
@@ -770,13 +771,15 @@ CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
 			code_conv = conv_latintodisp;
 		break;
 	case C_SHIFT_JIS:
-		if (dest_charset == C_AUTO)
+		if (dest_charset == C_AUTO &&
+		    conv_get_current_charset() == C_EUC_JP)
 			code_conv = conv_sjistodisp;
 		else if (dest_charset == C_EUC_JP)
 			code_conv = conv_sjistoeuc;
 		break;
 	case C_EUC_JP:
-		if (dest_charset == C_AUTO)
+		if (dest_charset == C_AUTO &&
+		    conv_get_current_charset() == C_EUC_JP)
 			code_conv = conv_euctodisp;
 		else if (dest_charset == C_ISO_2022_JP ||
 			 dest_charset == C_ISO_2022_JP_2)
-- 
2.25.1