2005-08-05 [paul] 1.9.13cvs14

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index a0d83f5e1db4db94809bb239da215487c4988f7a..994622c44e475fb37f10ff58fed5dc623d8e0587 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1014,26 +1014,31 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        summary_lock(summaryview);
                }
        } else {
-               /* select first unread message */
-               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                    MSG_UNREAD, FALSE);
+               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);
+                               break;
+                       default:
+                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    0, FALSE);
+               }
+
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
                        node = gtk_ctree_node_nth
                                (ctree,
                                 item->sort_type == SORT_DESCENDING
                                 ? 0 : GTK_CLIST(ctree)->rows - 1);
                }
-               if (prefs_common.open_unread_on_enter) {
-                       summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, 
-                                           messageview_is_visible(summaryview->messageview), 
-                                           TRUE);
-                       summary_lock(summaryview);
-               } else {
-                       summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
-                       summary_lock(summaryview);
-               }
+               summary_unlock(summaryview);
+               summary_select_node(summaryview, node,
+                                   prefs_common.always_show_msg,
+                                   TRUE);
+               summary_lock(summaryview);
        }
 
        summary_set_column_titles(summaryview);
@@ -5230,10 +5235,6 @@ static gboolean processing_apply_func(GNode *node, gpointer data)
                STATUSBAR_PUSH(summaryview->mainwin, buf);
                g_free(buf);
 
-/*
-               mlist = item->folder->get_msg_list(item->folder, item,
-                                                  TRUE);
-*/             
                mlist = folder_item_get_msg_list(item);
                for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = cur->next) {
                        MsgInfo * msginfo;