[Commits] summaryview.c 1.395.2.456 1.395.2.456.2.1

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv29293/src

Modified Files:
      Tag: stable_3_9
	summaryview.c 
Log Message:
2012-11-18 [colin]	3.9.0cvs3-stable

	* src/summaryview.c
		Backport 3.9.0cvs6: Fix bug #2785, "Marking mails for 
		deletion reopens internal message view"

Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.456
retrieving revision 1.395.2.456.2.1
diff -u -d -r1.395.2.456 -r1.395.2.456.2.1
--- summaryview.c	26 Sep 2012 08:54:05 -0000	1.395.2.456
+++ summaryview.c	18 Nov 2012 16:34:01 -0000	1.395.2.456.2.1
@@ -4353,6 +4353,7 @@
 	AlertValue aval;
 	MsgInfo *msginfo;
 	gboolean froze = FALSE;
+	gboolean show = FALSE;
 
 	if (!item) return;
 
@@ -4402,7 +4403,11 @@
 	if (!node)
 		node = summary_find_prev_msg(summaryview, sel_last);
 
-	summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+	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);
 	
 	if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
 		summary_execute(summaryview);