2004-10-03 [colin] 0.9.12cvs120

	* src/summaryview.c
		Fix bug #602

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d48a39df72aa5a793866a8e7fb23292b08b598b0..e172fea959d122f24bf85ab6af813f5f71dd29eb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-10-03 [colin]     0.9.12cvs120
+
+       * src/summaryview.c
+               Fix bug #602
+
 2004-10-02 [colin]     0.9.12cvs119
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index b410dc6dcbbed730011d69d625afd55acb139882..13a877bb093df52fd066b14592990d92f979446f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -102,3 +102,4 @@
 ( cvs diff -u -r 1.126 -r 1.127 src/mimeview.c; ) > 0.9.12cvs117.patchset
 ( cvs diff -u -r 1.127 -r 1.128 src/mimeview.c; ) > 0.9.12cvs118.patchset
 ( cvs diff -u -r 1.310 -r 1.311 src/mainwindow.c; cvs diff -u -r 1.124 -r 1.125 src/messageview.c; cvs diff -u -r 1.114 -r 1.115 src/prefs_common.h; cvs diff -u -r 1.84 -r 1.85 src/procmime.c; cvs diff -u -r 1.29 -r 1.30 src/procmime.h; cvs diff -u -r 1.123 -r 1.124 src/textview.c; ) > 0.9.12cvs119.patchset
+( cvs diff -u -r 1.446 -r 1.447 src/summaryview.c; ) > 0.9.12cvs120.patchset

diff --git a/configure.ac b/configure.ac
index f5ea46770d8b4e8b31f8f325132a7f9711e9cf47..5582ad1646a41ba1cfe572c48dd822fd4bfec6e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=119
+EXTRA_VERSION=120
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/summaryview.c b/src/summaryview.c
index 3c05129b3851992e956db30d4e6e4b1f1bfd696e..8e0852f70aa1db2b8b5b8db5294575c9feef95cf 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1236,9 +1236,16 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
+       gboolean skip_cur = FALSE;
+       
+       if (summaryview->displayed 
+       &&  summaryview->selected == summaryview->displayed) {
+               debug_print("skipping cur\n");
+               skip_cur = TRUE;
+       }
 
        node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
+               (summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
 
        if (!node) {
                AlertValue val = 0;
@@ -1275,9 +1282,16 @@ void summary_select_next_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node = summaryview->selected;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       gboolean skip_cur = FALSE;
+       
+       if (summaryview->displayed 
+       &&  summaryview->selected == summaryview->displayed) {
+               debug_print("skipping cur\n");
+               skip_cur = TRUE;
+       }
 
        node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_UNREAD, TRUE);
+               (summaryview, node, MSG_UNREAD, skip_cur);
        
        if (node)
                summary_select_node(summaryview, node, TRUE, FALSE);