2012-01-09 [colin] 3.8.0cvs12
authorColin Leroy <colin@colino.net>
Mon, 9 Jan 2012 18:47:15 +0000 (18:47 +0000)
committerColin Leroy <colin@colino.net>
Mon, 9 Jan 2012 18:47:15 +0000 (18:47 +0000)
* src/summaryview.c
Fix bug 1924, 'Messages marked move to Trash appear
identical to messages marked move to $FOLDER'

ChangeLog
PATCHSETS
configure.ac
src/summaryview.c

index d0fe2b8..e034680 100644 (file)
--- 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
index 7861c0e..205a8f8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 9624bed..4737593 100644 (file)
@@ -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=
 
index eec42c7..6134f58 100644 (file)
@@ -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);