sync with 0.8.11cvs38
authorPaul Mangan <paul@claws-mail.org>
Thu, 1 May 2003 10:03:20 +0000 (10:03 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 1 May 2003 10:03:20 +0000 (10:03 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/action.c
src/codeconv.c

index fc0157b..0fceb82 100644 (file)
--- 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:
index 58ca86a..819e046 100644 (file)
@@ -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
index 48e8488..dcf4095 100644 (file)
@@ -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:
index b84608a..c3ffb18 100644 (file)
@@ -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
index 04d605d..3c0701e 100644 (file)
@@ -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);
index 50990d8..01bcf6f 100644 (file)
@@ -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)