[Commits] summaryview.c 1.395.2.442 1.395.2.443

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	summaryview.c 
Log Message:
2012-01-09 [colin]	3.8.0cvs12

	* src/summaryview.c
		Fix bug 1924, 'Messages marked move to Trash appear 
		identical to messages marked move to $FOLDER'

Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.442
retrieving revision 1.395.2.443
diff -u -d -r1.395.2.442 -r1.395.2.443
--- summaryview.c	16 Dec 2011 13:30:33 -0000	1.395.2.442
+++ summaryview.c	9 Jan 2012 18:47:13 -0000	1.395.2.443
@@ -3794,13 +3794,24 @@
 	} else if (MSG_IS_MOVE(flags)) {
 		gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
 					  movedxpm);
-		if (style)
-			style = bold_marked_style;
-		else {
-			style = small_marked_style;
-		}
+		if (!msginfo->to_folder ||
+		    !folder_has_parent_of_type(msginfo->to_folder, F_TRASH)) {
+			if (style)
+				style = bold_marked_style;
+			else {
+				style = small_marked_style;
+			}
 			gtk_cmctree_node_set_foreground
 				(ctree, row, &summaryview->color_marked);
+		} else {
+			if (style)
+				style = bold_deleted_style;
+			else {
+				style = small_deleted_style;
+			}
+				gtk_cmctree_node_set_foreground
+					(ctree, row, &summaryview->color_dim);
+		}
 	} else if (MSG_IS_COPY(flags)) {
 		gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
 					  copiedxpm);