more sync with sylpheed 0.6.2cvs12

diff --git a/ChangeLog b/ChangeLog
index 2fe1a90..2a1465d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
          Melvin Hadasht).
        * src/summaryview.c: delete messages permanently if the current
          folder is trash and 'delete' operation is executed.
+         Fixed the bug that didn't select the last row correctly (thanks
+         to Alfons Hoogervorst).
        * src/folder.[ch]: folder_item_remove_msgs(): new. It removes
          all messages given in the list.
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e0fc2e3..e4be3c1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-10-08 [paul]      0.6.2claws24
+
+       * src/summaryview.c
+               more sync with sylpheed 0.6.2cvs12
+               Fixed the bug that didn't select the last row correctly
+
+
 2001-10-07 [paul]      0.6.2claws23
 
        * sync with sylpheed 0.6.2cvs12

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 5bf19c9..bacbea5 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -6,6 +6,8 @@
          ¤µ¤ó thanks)¡£
        * src/summaryview.c: ¸½ºß¤Î¥Õ¥©¥ë¥À¤¬¤´¤ßÈ¢¤Î¾ì¹ç¤Ë¡Öºï½ü¡×Áàºî¤ò
          ¼Â¹Ô¤·¤¿¤é¥á¥Ã¥»¡¼¥¸¤ò´°Á´ºï½ü¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+         ºÇ¸å¤Î¹Ô¤òÀµ¤·¤¯ÁªÂò¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ(Alfons Hoogervorst ¤µ¤ó
+         thanks)¡£
        * src/folder.[ch]: folder_item_remove_msgs(): ¿·µ¬¡£¥ê¥¹¥È¤ÇÍ¿¤¨
          ¤é¤ì¤¿Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë¡£
 

diff --git a/configure.in b/configure.in
index f28bf9e..adc63d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws23
+EXTRA_VERSION=claws24
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/summaryview.c b/src/summaryview.c
index 8e9d655..8267571 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -910,8 +910,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                           message, but do not display it */
                        node = summary_find_next_unread_msg(summaryview, NULL);
                        if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
-                               node = GTK_CTREE_NODE
-                                       (GTK_CLIST(ctree)->row_list_end);
+                               node = gtk_ctree_node_nth
+                                       (ctree, GTK_CLIST(ctree)->rows - 1);
                        summary_select_node(summaryview, node, FALSE);
                }
        } else {
@@ -1380,7 +1380,7 @@ static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
        if (current_node)
                node = current_node;
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
@@ -1420,7 +1420,7 @@ static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
        if (current_node)
                node = GTK_CTREE_NODE_PREV(current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
@@ -1460,7 +1460,7 @@ static GtkCTreeNode *summary_find_prev_labeled_msg(SummaryView *summaryview,
        if (current_node)
                node = GTK_CTREE_NODE_PREV(current_node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);