2006-07-02 [colin] 2.3.1cvs51
authorColin Leroy <colin@colino.net>
Sun, 2 Jul 2006 21:34:31 +0000 (21:34 +0000)
committerColin Leroy <colin@colino.net>
Sun, 2 Jul 2006 21:34:31 +0000 (21:34 +0000)
* src/folderview.c
Open message when crossing folders with Space,
goto next unread and friends

ChangeLog
PATCHSETS
configure.ac
src/folderview.c

index 76813768c59e84d18283d1c88175f2d170aef8e0..d7c32aa3b062c2a00c33ff18b7a002a5b8473307 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-02 [colin]     2.3.1cvs51
+
+       * src/folderview.c
+               Open message when crossing folders with Space,
+               goto next unread and friends
+
 2006-07-01 [colin]     2.3.1cvs50
 
        * src/prefs_account.c
index a68e820419fc3e0e06520867ddfcee7c615e0d1c..ebc0191197a5d31d3c0bb1f9f4c2f0fdb1af3a63 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.105.2.59 -r 1.105.2.60 src/prefs_account.c;  cvs diff -u -r 1.49.2.20 -r 1.49.2.21 src/prefs_account.h;  ) > 2.3.1cvs48.patchset
 ( cvs diff -u -r 1.105.2.60 -r 1.105.2.61 src/prefs_account.c;  ) > 2.3.1cvs49.patchset
 ( cvs diff -u -r 1.105.2.61 -r 1.105.2.62 src/prefs_account.c;  ) > 2.3.1cvs50.patchset
+( cvs diff -u -r 1.207.2.105 -r 1.207.2.106 src/folderview.c;  ) > 2.3.1cvs51.patchset
index c836e0620b62bf95953b8ec5558a9fac16f1d211..7eaef48d7725ef990cdae728bef13a6351baa37a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=50
+EXTRA_VERSION=51
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 7890aba50084dc630b163d676a921fbb7a4f9c70..f0e4f394a586444e424075096b81b8ae6ca05641 100644 (file)
@@ -801,24 +801,28 @@ void folderview_select_next_marked(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
        SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
        prefs_common.select_on_entry = SELECTONENTRY_MNU;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_marked(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               prefs_common.select_on_entry = last_sel;
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
            folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
-               prefs_common.select_on_entry = last_sel;
-               return;
+               goto out;
        }
        /* search again from the first node */
        if ((node = folderview_find_next_marked(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
+
+out:
        prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
 }
 
 static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
@@ -845,26 +849,28 @@ void folderview_select_next_unread(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
        SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
        prefs_common.select_on_entry = SELECTONENTRY_UNM;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_unread(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               prefs_common.select_on_entry = last_sel;
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
            folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
-               prefs_common.select_on_entry = last_sel;
-               return;
+               goto out;
        }
        /* search again from the first node */
        if ((node = folderview_find_next_unread(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
 
+out:
        prefs_common.select_on_entry = last_sel;
-
+       prefs_common.always_show_msg = last_open;
 }
 
 static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
@@ -891,24 +897,28 @@ void folderview_select_next_new(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
        SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
        prefs_common.select_on_entry = SELECTONENTRY_NUM;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_new(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               prefs_common.select_on_entry = last_sel;
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
            folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
-               prefs_common.select_on_entry = last_sel;
-               return;
+               goto out;
        }
        /* search again from the first node */
        if ((node = folderview_find_next_new(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
+
+out:
        prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
 }
 
 FolderItem *folderview_get_selected_item(FolderView *folderview)