[Commits] [SCM] claws branch, master, updated. 3.17.4-18-g279594630

[paul at claws-mail.org]

The branch, master has been updated
       via  279594630c9000a3f9ac4e5a289ed187e02058a4 (commit)
      from  5d413b1a5baaccb3b2e12ed326aad36d0a3bef61 (commit)

Summary of changes:
 src/folderview.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 279594630c9000a3f9ac4e5a289ed187e02058a4
Author: Paul <paul at claws-mail.org>
Date:   Sat Sep 14 09:44:10 2019 +0100

    fix bolding of target folder
    
    target folder (when not using 'execute immediately') lost its boldness
    recently. This reinstates that, and makes the target folder colour
    override all other colours.

diff --git a/src/folderview.c b/src/folderview.c
index 31bc048d7..86ec4be2c 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1713,8 +1713,8 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 			use_bold = use_color = TRUE;
 		procmsg_msg_list_free(list);
 	} else {
-		/* if unread messages exist, print with bold font */
-		use_bold = (item->unread_msgs > 0|| item->new_msgs > 0) 
+		/* if unread messages exist or target folder is set, print with bold font */
+		use_bold = (item->unread_msgs > 0 || item->new_msgs > 0 || item->op_count > 0)
 				|| add_unread_mark;
 		/* if new messages exist, print with colored letter */
 		use_color =
@@ -1727,18 +1727,16 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 
 	if (use_bold) {
 		style = bold_style;
-		if (use_color) {
-			gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
-		} else if (item->op_count > 0) {
+		if (item->op_count > 0) {
 			gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_op);
+		} else if (use_color) {
+			gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
 		} else if (item->prefs->color != 0) {
 			gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
 			gtk_cmctree_node_set_foreground(ctree, node, &gdk_color);
 		}
 	} else if (use_color) {
 		gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
-	} else if (item->op_count > 0) {
-		gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_op);
 	} else if (item->prefs->color != 0) {
 		gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
 		gtk_cmctree_node_set_foreground(ctree, node, &gdk_color);

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


hooks/post-receive
-- 
Claws Mail