2005-08-08 [colin] 1.9.13cvs28
authorColin Leroy <colin@colino.net>
Mon, 8 Aug 2005 20:21:29 +0000 (20:21 +0000)
committerColin Leroy <colin@colino.net>
Mon, 8 Aug 2005 20:21:29 +0000 (20:21 +0000)
* src/summaryview.c
* src/prefs_summaries.c
Make "Select first unread|new" more flexible
(just prioritize new or unread)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/prefs_summaries.c
src/summaryview.c

index a6a214cb836de3b240c77829b0f53a91141d30f5..c422d2d97483dffbe2a912183c493b05cac188b8 100644 (file)
@@ -1,3 +1,10 @@
+2005-08-08 [colin]     1.9.13cvs28
+
+       * src/summaryview.c
+       * src/prefs_summaries.c
+               Make "Select first unread|new" more flexible
+               (just prioritize new or unread)
+
 2005-08-08 [colin]     1.9.13cvs27
 
        * src/summaryview.c
index 3d9e012de9253e7bdc723ba878e37f65dd40daf0..34165a1e846cfdec58642561c41db0c51cb2f092 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
+( cvs diff -u -r 1.395.2.108 -r 1.395.2.109 src/summaryview.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_summaries.c;  ) > 1.9.13cvs28.patchset
index e1a0eac29d05462c127af7e8c1d0b6f0a34f7e2e..1b16606db76d4b405c23e4b5030aeddb99f8ed1e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d5453a414ebde87281b3b584ec268918afe5cb2c..781b409be6ba484291179e8521276160995e644c 100644 (file)
@@ -875,10 +875,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        
        menu = gtk_menu_new ();
        MENUITEM_ADD (menu, menuitem, _("Do nothing"), 0);
-       MENUITEM_ADD (menu, menuitem, _("Select first unread message"),
-                     SELECTONENTRY_UNREAD);
-       MENUITEM_ADD (menu, menuitem, _("Select first new message"),
+       MENUITEM_ADD (menu, menuitem, _("Select first new (or unread) message"),
                      SELECTONENTRY_NEW);
+       MENUITEM_ADD (menu, menuitem, _("Select first unread (or new) message"),
+                     SELECTONENTRY_UNREAD);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_select_on_entry), menu);
        
index be43953e6284c1a4152f806a18d9da084156d629..92be606efc0cae08ab2a64d2a7377db43d36f631 100644 (file)
@@ -1019,16 +1019,19 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        case SELECTONENTRY_NEW:
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     MSG_NEW, FALSE);
-                               /* 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:
+                       case SELECTONENTRY_UNREAD:
                                node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                                    0, FALSE);
+                                                                    MSG_UNREAD, FALSE);
+                               if (node == NULL)
+                                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_NEW, FALSE);
+                               break;
+                       default:
+                               node = NULL;
                }
 
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {