talons

commit 0db1fd2fdaff073b5c5504b36165c43d777f819b
parent e39dd37bd199e17f225ee088011b47cd470c09b2
Author: paul <paul@claws-mail.org>
Date:   Tue, 19 Nov 2019 10:40:00 +0000

fix merging errors

Diffstat:
M
src/folderview.c
 | 
5
++---
M
src/sourcewindow.c
 | 
1
-

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/folderview.c b/src/folderview.c
@@ -1733,9 +1733,8 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 		}
 	} else if (use_color) {
 		gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
-	} else if (item->prefs->color != 0) {
-		gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
-		gtk_cmctree_node_set_foreground(ctree, node, &gdk_color);
+	} else if (!gdk_rgba_equal(&item->prefs->color, &black)) {
+		gtk_cmctree_node_set_foreground(ctree, node, &item->prefs->color);
 	}
 
 	gtk_cmctree_node_set_row_style(ctree, node, style);
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
@@ -64,7 +64,6 @@ SourceWindow *source_window_create(void)
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "sourcewindow");
 	gtk_window_set_title(GTK_WINDOW(window), _("Source of the message"));
 	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-	gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.sourcewin_width,
 	gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_widget_set_size_request(window, prefs_common.sourcewin_width,
 				    prefs_common.sourcewin_height);