reverted the behavior when 'Always open messages in summary when selected' is off (don't display a message when opening a folder).

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2753 ee746299-78ed-0310-b773-934348b2243d

2 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a90e880..b7d4664d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-14
+
+	* src/summaryview.c: reverted the behavior when 'Always open messages
+	  in summary when selected' is off (don't display a message when
+	  opening a folder).
+
 2010-12-09
 
 	* version 3.1.0beta5
diff --git a/src/summaryview.c b/src/summaryview.c
index 01606b76..c2d5a1e6 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -894,14 +894,19 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 		/* select first unread message */
 		if (summary_find_next_flagged_msg(summaryview, &iter, NULL,
 						  MSG_UNREAD, FALSE)) {
-			summary_unlock(summaryview);
-			summary_select_row(summaryview, &iter, TRUE, TRUE);
-			summary_lock(summaryview);
+			if (prefs_common.open_unread_on_enter ||
+			    prefs_common.always_show_msg) {
+				summary_unlock(summaryview);
+				summary_select_row(summaryview, &iter,
+						   TRUE, TRUE);
+				summary_lock(summaryview);
+			} else
+				summary_select_row(summaryview, &iter,
+						   FALSE, TRUE);
 		} else {
 			summary_unlock(summaryview);
 			if (item->sort_type == SORT_ASCENDING &&
 			    SUMMARY_DISPLAY_TOTAL_NUM(item) > 1) {
-				summaryview->display_msg = TRUE;
 				g_signal_emit_by_name
 					(treeview, "move-cursor",
 					 GTK_MOVEMENT_BUFFER_ENDS, 1, &moved);
@@ -909,7 +914,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 					(GTK_TREE_MODEL(summaryview->store),
 					 &iter)) {
 				summary_select_row(summaryview, &iter,
-						   TRUE, TRUE);
+						   FALSE, TRUE);
 			}
 			summary_lock(summaryview);
 			GTK_EVENTS_FLUSH();