* 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)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 34ff57e67ce37be33c117fe187754b0a12472479..f31c722fcade0fe226ec74d69e2d7436d95d0314 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -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
 2003-08-03 [melvin]    0.9.3claws94
 
        * po/fr.po

diff --git a/configure.ac b/configure.ac
index c77aafe67a48e1364081892d0566c0732b2bc133..66b9f1c7207ee9747beeb55dda43b720e47bb094 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/summaryview.c b/src/summaryview.c
index 77e6092859189231e32004189f23643952d60fd7..bccaa7f9fc79d4408bbaf0fac1ac70083cf32fd4 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2701,6 +2701,9 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                }
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_dim);
                }
                        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)
        } 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);
                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);
        }
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }