use the colour from the folder pref unless the folder has new messages

diff --git a/ChangeLog.claws b/ChangeLog.claws
index faa4aa4125a62349f2b24c8361c30fcfe1c12e70..66358347e1c095892483086c8235574876d592ef 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,10 @@
-2003-07-28 [alfons]    0.9.3claws69
+2003-07-29 [paul]      0.9.3claws70
+
+       * src/folderview.c
+               use the colour from the folder pref unless the folder
+               has new messages
+
+2003-07-29 [alfons]    0.9.3claws69
 
        * src/procmsg.[ch]
        * src/messageview.c

diff --git a/configure.ac b/configure.ac
index a418e4ab4c467962e3755d711ab485b0e78b3b5e..1808e99238e4d3b1bb60d4b48b2f7b1bad48fadd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/folderview.c b/src/folderview.c
index 401be57017cd85ca2f4a502f4df0020b386705df..9d317cfe7aaff1873b3c9a23dfdbd6cef3efb180 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1183,10 +1183,18 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_bold && use_color) {
-               style = bold_color_style;
-       } else if (use_bold) {
-               style = bold_style;
+       if (use_bold) {
+               if (item->prefs->color > 0 && !use_color) {
+                       GdkColor gdk_color;
+
+                       gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+                       color_style = gtk_style_copy(bold_style);
+                       color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+                       style = color_style;
+               } else if (use_color)
+                       style = bold_color_style;
+               else
+                       style = bold_style;
                if (item->op_count > 0) {
                        style = bold_tgtfold_style;
                }