talons

commit 50eb6841a10f15002067b0ed0604d56a5c7473fc
parent 1c00de0a1182a632851867e26ae3a4c53226d259
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  8 Jul 2008 05:42:05 +0000

2008-07-08 [colin]	3.5.0cvs22

	* src/folderview.c
	* src/summaryview.c
		Finish the always_open tristate patch, by Jonathan
		Corbet.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folderview.c
 | 
6
+++---
M
src/summaryview.c
 | 
10
++++++----

5 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-08 [colin]	3.5.0cvs22
+
+	* src/folderview.c
+	* src/summaryview.c
+		Finish the always_open tristate patch, by Jonathan
+		Corbet.
+
 2008-07-07 [paul]	3.5.0cvs21
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3433,3 +3433,4 @@
 ( cvs diff -u -r 1.3.2.57 -r 1.3.2.58 src/prefs_themes.c;  ) > 3.5.0cvs19.patchset
 ( cvs diff -u -r 1.274.2.250 -r 1.274.2.251 src/mainwindow.c;  ) > 3.5.0cvs20.patchset
 ( cvs diff -u -r 1.274.2.251 -r 1.274.2.252 src/mainwindow.c;  ) > 3.5.0cvs21.patchset
+( cvs diff -u -r 1.207.2.201 -r 1.207.2.202 src/folderview.c;  cvs diff -u -r 1.395.2.372 -r 1.395.2.373 src/summaryview.c;  ) > 3.5.0cvs22.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folderview.c b/src/folderview.c
@@ -953,7 +953,7 @@ void folderview_select_next_marked(FolderView *folderview)
 	gboolean last_open = prefs_common.always_show_msg;
 	
 	prefs_common.summary_select_prio[0] = ACTION_MARKED;
-	prefs_common.always_show_msg = TRUE;
+	prefs_common.always_show_msg = OPENMSG_ALWAYS;
 
 	if ((node = folderview_find_next_marked(ctree, folderview->opened))
 	    != NULL) {
@@ -1001,7 +1001,7 @@ void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
 	gboolean last_open = prefs_common.always_show_msg;
 	
 	prefs_common.summary_select_prio[0] = ACTION_UNREAD;
-	prefs_common.always_show_msg = force_open ? TRUE : last_open;
+	prefs_common.always_show_msg = force_open ? OPENMSG_ALWAYS : last_open;
 
 	if ((node = folderview_find_next_unread(ctree, folderview->opened))
 	    != NULL) {
@@ -1049,7 +1049,7 @@ void folderview_select_next_new(FolderView *folderview)
 	gboolean last_open = prefs_common.always_show_msg;
 	
 	prefs_common.summary_select_prio[0] = ACTION_NEW;
-	prefs_common.always_show_msg = TRUE;
+	prefs_common.always_show_msg = OPENMSG_ALWAYS;
 
 	if ((node = folderview_find_next_new(ctree, folderview->opened))
 	    != NULL) {
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -1486,10 +1486,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 		}
 
 		summary_unlock(summaryview);
-		if (node)
-			summary_select_node(summaryview, node,
-				    prefs_common.always_show_msg,
-				    TRUE);
+		if (node) {
+			gboolean show = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+				(prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
+						messageview_is_visible(summaryview->messageview));
+			summary_select_node(summaryview, node, show, TRUE);
+		}
 		summary_lock(summaryview);
 	}