* src/summaryview.c
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 3 Aug 2003 10:36:02 +0000 (10:36 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 3 Aug 2003 10:36:02 +0000 (10:36 +0000)
mark flag has precedence over important flag - seems
to have been changed in sync of 0.9.3claws45. this fixes
a regression where messages that were scored as important
don't show their mark flags. (using the same column for
both importance as mark flags is the real problem
ofcourse)

ChangeLog.claws
configure.ac
src/summaryview.c

index 34ff57e..f31c722 100644 (file)
@@ -1,3 +1,13 @@
+2003-08-03 [alfons]    0.9.3claws95
+
+       * src/summaryview.c
+               mark flag has precedence over important flag - seems
+               to have been changed in sync of 0.9.3claws45. this fixes
+               a regression where messages that were scored as important
+               don't show their mark flags. (using the same column for
+               both importance as mark flags is the real problem
+               ofcourse)
+
 2003-08-03 [melvin]    0.9.3claws94
 
        * po/fr.po
index c77aafe..66b9f1c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=94
+EXTRA_VERSION=95
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 77e6092..bccaa7f 100644 (file)
@@ -2701,6 +2701,9 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                }
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_dim);
+       } else if (MSG_IS_MARKED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+                                         markxpm, markxpmmask);
        } else if (MSG_IS_MOVE(flags)) {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "o");
                if (style)
@@ -2726,9 +2729,6 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
                gtk_ctree_node_set_foreground(ctree, row,
                                              &summaryview->color_important);
-       } else if (MSG_IS_MARKED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
-                                         markxpm, markxpmmask);
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }