2006-10-02 [colin] 2.5.2cvs36

	* src/folderview.c
		Fix 'goto next unread' after collapsing/expanding
		a node.

diff --git a/ChangeLog b/ChangeLog
index a3d1302f6f55226af8aa61ca539c893899d10d8e..728d5933f42a03349214bdf0a34eee88d96e9c23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-02 [colin]     2.5.2cvs36
+
+       * src/folderview.c
+               Fix 'goto next unread' after collapsing/expanding 
+               a node.
+
 2006-10-02 [colin]     2.5.2cvs35
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index f5e6190aba9d02c3564e121f54b6308b18a91ef1..bc84f1044d7a8fc8f7bed809b369577af161985c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1949,3 +1949,4 @@
 ( cvs diff -u -r 1.213.2.118 -r 1.213.2.119 src/folder.c;  cvs diff -u -r 1.79.2.45 -r 1.79.2.46 src/mh.c;  cvs diff -u -r 1.9.2.3 -r 1.9.2.4 src/mh.h;  cvs diff -u -r 1.16.2.43 -r 1.16.2.44 src/msgcache.c;  ) > 2.5.2cvs33.patchset
 ( cvs diff -u -r 1.79.2.46 -r 1.79.2.47 src/mh.c;  cvs diff -u -r 1.395.2.259 -r 1.395.2.260 src/summaryview.c;  ) > 2.5.2cvs34.patchset
 ( cvs diff -u -r 1.47.2.33 -r 1.47.2.34 src/procheader.c;  cvs diff -u -r 1.395.2.260 -r 1.395.2.261 src/summaryview.c;  cvs diff -u -r 1.36.2.81 -r 1.36.2.82 src/common/utils.c;  cvs diff -u -r 1.20.2.38 -r 1.20.2.39 src/common/utils.h;  ) > 2.5.2cvs35.patchset
+( cvs diff -u -r 1.207.2.125 -r 1.207.2.126 src/folderview.c;  ) > 2.5.2cvs36.patchset

diff --git a/configure.ac b/configure.ac
index 4ff4f4f38576b3d50540269554c9e9154d58a12a..01e35f46dda5469b572f3ff98316ceb07f62da94 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 6692e51742e006e1cce1de72030ff52b3a21d128..cbea1c2f96ca8cae9f95adab9483890a43a22ca8 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -802,6 +802,7 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
 
        folderview->open_folder = TRUE;
        gtkut_ctree_set_focus_row(ctree, node);
+
        gtk_ctree_select(ctree, node);
        if (folderview->summaryview->folder_item &&
            folderview->summaryview->folder_item->total_msgs > 0)
@@ -881,6 +882,7 @@ static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                item = gtk_ctree_node_get_row_data(ctree, node);
+
                if (item && item->unread_msgs > 0 && item->stype != F_TRASH)
                        return node;
        }
@@ -1932,7 +1934,6 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (!event) return FALSE;
 
        if (event->button == 1 || event->button == 2) {
-               folderview->open_folder = TRUE;
 
                if (event->type == GDK_2BUTTON_PRESS) {
                        if (clist->selection) {