talons

commit 8ecec4fac24705ac8e6b0e574fd76369e0ca44a2
parent 07eda17f042dfe8217d28f7e0422316d95dcc99b
Author: Colin Leroy <colin@colino.net>
Date:   Mon,  9 Jan 2012 18:47:15 +0000

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'

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

4 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+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'
+
 2012-01-05 [colin]	3.8.0cvs11
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4328,3 +4328,4 @@
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs9.patchset
 ( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/gtk/gtkcmctree.c;  ) > 3.8.0cvs10.patchset
 ( cvs diff -u -r 1.115.2.245 -r 1.115.2.246 src/main.c;  ) > 3.8.0cvs11.patchset
+( cvs diff -u -r 1.395.2.442 -r 1.395.2.443 src/summaryview.c;  ) > 3.8.0cvs12.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -3794,13 +3794,24 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
 	} 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);