2005-08-08 [colin] 1.9.13cvs27

	* src/summaryview.c
		If "select first new" is selected and there only
		are unread messages, fallback to "select first
		unread".

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 17c750176c39e94cd8c7c2a1afacbab226689b49..a6a214cb836de3b240c77829b0f53a91141d30f5 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-08-08 [colin]     1.9.13cvs27
+
+       * src/summaryview.c
+               If "select first new" is selected and there only
+               are unread messages, fallback to "select first
+               unread".
+

 2005-08-08 [colin]     1.9.13cvs26
 
        * src/folder.c
 2005-08-08 [colin]     1.9.13cvs26
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 0ab5dcdf4d1b268dc795c2f877eb07cd5923847f..3d9e012de9253e7bdc723ba878e37f65dd40daf0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -712,3 +712,4 @@
 ( cvs diff -u -r 1.213.2.46 -r 1.213.2.47 src/folder.c;  ) > 1.9.13cvs24.patchset
 ( cvs diff -u -r 1.213.2.47 -r 1.213.2.48 src/folder.c;  cvs diff -u -r 1.87.2.15 -r 1.87.2.16 src/folder.h;  cvs diff -u -r 1.207.2.54 -r 1.207.2.55 src/folderview.c;  cvs diff -u -r 1.150.2.33 -r 1.150.2.34 src/procmsg.c;  cvs diff -u -r 1.60.2.13 -r 1.60.2.14 src/procmsg.h;  cvs diff -u -r 1.395.2.106 -r 1.395.2.107 src/summaryview.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/plugins/Makefile.am;  ) > 1.9.13cvs25.patchset
 ( cvs diff -u -r 1.213.2.48 -r 1.213.2.49 src/folder.c;  ) > 1.9.13cvs26.patchset
 ( cvs diff -u -r 1.213.2.46 -r 1.213.2.47 src/folder.c;  ) > 1.9.13cvs24.patchset
 ( cvs diff -u -r 1.213.2.47 -r 1.213.2.48 src/folder.c;  cvs diff -u -r 1.87.2.15 -r 1.87.2.16 src/folder.h;  cvs diff -u -r 1.207.2.54 -r 1.207.2.55 src/folderview.c;  cvs diff -u -r 1.150.2.33 -r 1.150.2.34 src/procmsg.c;  cvs diff -u -r 1.60.2.13 -r 1.60.2.14 src/procmsg.h;  cvs diff -u -r 1.395.2.106 -r 1.395.2.107 src/summaryview.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/plugins/Makefile.am;  ) > 1.9.13cvs25.patchset
 ( cvs diff -u -r 1.213.2.48 -r 1.213.2.49 src/folder.c;  ) > 1.9.13cvs26.patchset

+( cvs diff -u -r 1.395.2.107 -r 1.395.2.108 src/summaryview.c;  ) > 1.9.13cvs27.patchset

diff --git a/configure.ac b/configure.ac
index d0897a20889d1f40994ecffbefb280318a115622..e1a0eac29d05462c127af7e8c1d0b6f0a34f7e2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=26
+EXTRA_VERSION=27

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index bb070190948c2d7c3e2ee886777fa4aff398d6cc..be43953e6284c1a4152f806a18d9da084156d629 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1016,14 +1016,16 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
        } else {
                switch (prefs_common.select_on_entry) {
                }
        } else {
                switch (prefs_common.select_on_entry) {

-                       case SELECTONENTRY_UNREAD:
-                               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                                    MSG_UNREAD, FALSE);
-                               break;

                        case SELECTONENTRY_NEW:
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     MSG_NEW, FALSE);
                        case SELECTONENTRY_NEW:
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     MSG_NEW, FALSE);

-                               break;
+                               /* don't break, passthrough to first unread if no
+                                * new is found */
+                       case SELECTONENTRY_UNREAD:
+                               if (node == NULL)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_UNREAD, FALSE);
+                               break;

                        default:
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     0, FALSE);
                        default:
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     0, FALSE);