sync with sylpheed 0.6.4cvs1

diff --git a/ChangeLog b/ChangeLog
index 12d4fa7932b1baa99fe36811f53f6a8cea0d48ad..e474d5082c5188de1401f0534cedbf52275b9b7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-26
+
+       * src/textview.c: textview_set_font(): support Russian charset
+         on EUC-JP locale.
+       * src/summaryview.c: summary_delete(): (hopefully) fixed the crash
+         bug on deleting.
+
 2001-10-21
 
        * version 0.6.4

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4ce4fe4f90d602b4b741f00db392106af9015dad..6b0b2f6a109a82941854c42bdc8f6ff77f21aa8f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-10-26 [paul]      0.6.4claws7
+
+       * sync with sylpheed 0.6.4cvs1
+               see ChangeLog entry 2001-10-26
+
 2001-10-25 [alfons]    0.6.4claws6
 
        * src/gtkstext.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 9be2adda759deed84e9ede495a3f40d46f6a4ddf..d9bc4bc36f42e7fd9ca655aae1233bd841f5b749 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2001-10-26
+
+       * src/textview.c: textview_set_font(): EUC-JP locale ¤Ç¥í¥·¥¢¸ì
+         ¤Îʸ»ú½¸¹ç¤ËÂбþ¡£
+       * src/summaryview.c: summary_delete(): (¿ʬ)ºï½ü»þ¤Î¥¯¥é¥Ã¥·¥å
+         ¥Ð¥°¤ò½¤Àµ¡£
+
 2001-10-21
 
        * version 0.6.4

diff --git a/configure.in b/configure.in
index 5a203b996e0bcf0b06168497c2df6eb2cfc8e5c3..7ce56332d09b4c1be4cd84d8452e309b48fb2a07 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/summaryview.c b/src/summaryview.c
index 906b308aec2e558bec9d72133e5a6e155b96bca2..a63891cb354e66866f61e55a2e00641afd83bb07 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2649,14 +2649,16 @@ void summary_delete(SummaryView *summaryview)
        node = summary_find_next_msg(summaryview, sel_last);
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
-       if (node == gtkut_ctree_node_next(ctree, sel_last))
-               summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-       else if (node == GTK_CTREE_NODE_PREV(sel_last))
-               summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-       else
-               summary_select_node
-                       (summaryview, node,
-                        summaryview->msg_is_toggled_on);
+
+       if (node) {
+               if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
+                       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+               else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
+                       summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
+               else
+                       summary_select_node(summaryview, node,
+                                           summaryview->msg_is_toggled_on);
+       }
 
        if (prefs_common.immediate_exec || item->stype == F_TRASH)
                summary_execute(summaryview);

diff --git a/src/textview.c b/src/textview.c
index 5279b97b81f6d96adaccaf59d89dd32eb9b1d3d9..130e4fb5ce74e3511553458c740485e326e05144 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -843,11 +843,13 @@ void textview_set_font(TextView *textview, const gchar *codeset)
        if (MB_CUR_MAX > 1) {
                if (codeset) {
                        if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
-                           !g_strncasecmp(codeset, "KOI8-", 5)     ||
-                           !g_strncasecmp(codeset, "CP", 2)        ||
-                           !g_strncasecmp(codeset, "WINDOWS-", 8)  ||
                            !g_strcasecmp(codeset, "BALTIC"))
                                use_fontset = FALSE;
+                       else if (conv_get_current_charset() != C_EUC_JP &&
+                                (!g_strncasecmp(codeset, "KOI8-", 5) ||
+                                 !g_strncasecmp(codeset, "CP", 2)    ||
+                                 !g_strncasecmp(codeset, "WINDOWS-", 8)))
+                               use_fontset = FALSE;
                }
        } else
                use_fontset = FALSE;