[Commits] [SCM] claws branch, master, updated. 3.14.1-100-gcdbf2c3

[wwp at claws-mail.org]

The branch, master has been updated
       via  cdbf2c37c37c0207d4b14ceb8280795bc7a7f09b (commit)
      from  471d243cf77f32f7c974b8b4755f62f0dfd27591 (commit)

Summary of changes:
 src/summaryview.c |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)


- Log -----------------------------------------------------------------
commit cdbf2c37c37c0207d4b14ceb8280795bc7a7f09b
Author: wwp <wwp at free.fr>
Date:   Thu Jan 5 10:56:46 2017 +0100

    Revert parts of 3.14.1-91 (the summary_select_node_no_mard_read func), obviously it's
    been accidentally included in that commit and the origin of this modification is still
    undetermined.

diff --git a/src/summaryview.c b/src/summaryview.c
index 9413a00..41006d2 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -159,12 +159,6 @@ static GtkCMCTreeNode *summary_find_msg_by_msgnum
 
 static void summary_update_status	(SummaryView		*summaryview);
 
-static void summary_select_node_real(SummaryView *summaryview, GtkCMCTreeNode *node,
-			 gint force_display, gboolean ignore_mark_read);
-
-static void summary_select_node_no_mark_read(SummaryView *summaryview, GtkCMCTreeNode *node,
-			 gint force_display);
-
 /* display functions */
 static void summary_status_show		(SummaryView		*summaryview);
 static void summary_set_column_titles	(SummaryView		*summaryview);
@@ -1564,7 +1558,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 				else
 					open_selected = 0;
 			}
-			summary_select_node_no_mark_read(summaryview, node, open_selected);
+			summary_select_node(summaryview, node, open_selected);
 		}
 
 		summary_lock(summaryview);
@@ -2227,19 +2221,6 @@ static gboolean summary_select_retry(void *data)
 void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
 			 gint force_display)
 {
-	summary_select_node_real(summaryview, node, force_display, FALSE);
-
-}
-
-static void summary_select_node_no_mark_read(SummaryView *summaryview, GtkCMCTreeNode *node,
-			 gint force_display)
-{
-	summary_select_node_real(summaryview, node, force_display, TRUE);
-}
-
-static void summary_select_node_real(SummaryView *summaryview, GtkCMCTreeNode *node,
-			 gint force_display, gboolean ignore_mark_read)
-{
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	gboolean display_msg;
 	
@@ -2271,8 +2252,6 @@ static void summary_select_node_real(SummaryView *summaryview, GtkCMCTreeNode *n
 	if (!summaryview->folder_item)
 		return;
 	if (node) {
-		if (!ignore_mark_read)
-			summary_cancel_mark_read_timeout(summaryview);
 		gtkut_ctree_expand_parent_all(ctree, node);
 
 		summary_lock(summaryview);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail