2006-10-02 [colin] 2.5.2cvs37
authorColin Leroy <colin@colino.net>
Mon, 2 Oct 2006 20:02:42 +0000 (20:02 +0000)
committerColin Leroy <colin@colino.net>
Mon, 2 Oct 2006 20:02:42 +0000 (20:02 +0000)
* src/folderview.c
correct fix for cvs36

ChangeLog
PATCHSETS
configure.ac
src/folderview.c

index 728d5933f42a03349214bdf0a34eee88d96e9c23..2bd8bb3b2028cf776d9e889488513da6e30fad86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02 [colin]     2.5.2cvs37
+
+       * src/folderview.c
+               correct fix for cvs36
+
 2006-10-02 [colin]     2.5.2cvs36
 
        * src/folderview.c
index bc84f1044d7a8fc8f7bed809b369577af161985c..d78fca68c79ea1670ce0732151841399fbad827f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
+( cvs diff -u -r 1.207.2.126 -r 1.207.2.127 src/folderview.c;  ) > 2.5.2cvs37.patchset
index 01e35f46dda5469b572f3ff98316ceb07f62da94..f51222d61c783565c8c218481e2adc23401ccc71 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index cbea1c2f96ca8cae9f95adab9483890a43a22ca8..ae97b6e4bf579c7337ad88216a43b5f598fd1b10 100644 (file)
@@ -802,7 +802,6 @@ 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)
@@ -882,7 +881,6 @@ 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;
        }
@@ -1934,6 +1932,8 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (!event) return FALSE;
 
        if (event->button == 1 || event->button == 2) {
+               if (!gtk_ctree_is_hot_spot (GTK_CTREE(clist), event->x, event->y))
+                       folderview->open_folder = TRUE;
 
                if (event->type == GDK_2BUTTON_PRESS) {
                        if (clist->selection) {