2006-08-31 [colin] 2.4.0cvs119

	* src/folderview.c
		Revert 2.4.0cvs116, wrong fix.

diff --git a/ChangeLog b/ChangeLog
index eb40d4cbd920d807f6e0e46b36e9675b9016e04b..7d2d75b6b3de58d9d38f13da5a3cdf551f5aaae7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-31 [colin]     2.4.0cvs119
+
+       * src/folderview.c
+               Revert 2.4.0cvs116, wrong fix.
+
 2006-08-31 [colin]     2.4.0cvs118
 
        * src/gtk/gtksctree.c

diff --git a/PATCHSETS b/PATCHSETS
index f80176075c9e8c54dc65feb36afacbea4faa6c0c..7704710ad6e347dfc22ae1fd926b42dd5090f4d5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1810,3 +1810,4 @@
 ( cvs diff -u -r 1.207.2.115 -r 1.207.2.116 src/folderview.c;  cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/gtk/gtksctree.c;  ) > 2.4.0cvs116.patchset
 ( cvs diff -u -r 1.204.2.98 -r 1.204.2.99 src/prefs_common.c;  ) > 2.4.0cvs117.patchset
 ( cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/gtk/gtksctree.c;  ) > 2.4.0cvs118.patchset
+( cvs diff -u -r 1.207.2.116 -r 1.207.2.117 src/folderview.c;  ) > 2.4.0cvs119.patchset

diff --git a/configure.ac b/configure.ac
index 5499475e93caed1c6be5214948317ac56a9a2e5e..c688ed5edb885e7ef33ea009145b5607de447a80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=118
+EXTRA_VERSION=119
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 40ece2685959c2ce8102fc96f53cd83f2cc6c8c7..374395e13c852f6bb09bb1cc829bd8f1700af84b 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -878,9 +878,11 @@ 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) {
@@ -897,6 +899,7 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 
 out:
+       prefs_common.select_on_entry = last_sel;
        prefs_common.always_show_msg = last_open;
 }