Add open_selected_on_folder_open to common prefs.

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 67578ccf2b1e3c9b9ec77b565907e6383bc1e7f5..a58fa90c440507ab191b4f047dcc8e926b919633 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1550,8 +1550,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
 
                summary_unlock(summaryview);
-               if (node)
-                       summary_select_node(summaryview, node, -1);
+
+               if (node) {
+                       gint open_selected = -1;
+                       if (!is_refresh) {
+                               if (prefs_common.open_selected_on_folder_open)
+                                       open_selected = 1;
+                               else
+                                       open_selected = 0;
+                       }
+                       summary_select_node(summaryview, node, open_selected);
+               }
+
                summary_lock(summaryview);
        }
 
@@ -2230,7 +2240,7 @@ void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
        gboolean display_msg;
        
        display_msg = force_display > -1? force_display :
-               (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+               (prefs_common.always_show_msg == OPENMSG_YES) ||
                ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
                                messageview_is_visible(summaryview->messageview)));