sync with sylpheed 0.6.4cvs1

This commit is contained in:
Paul Mangan 2001-10-26 05:41:51 +00:00
parent b14f8a35d3
commit 9899fa9888
6 changed files with 35 additions and 12 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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);

View file

@ -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;