From ec2055d1b0bd5ea094c5ea2eb68c41beec35dc84 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 22 Mar 2011 14:35:23 -0400 Subject: [PATCH] Revert "styleproperties: don't force replacing the font description" It turns out the bug is more complicated than I originally understood. Not replacing the font description fields while merging here makes it impossible for application's CSS to override fonts. This reverts commit 89c1d93b68aaaebeb5db0dc2a58895721c6665aa. https://bugzilla.gnome.org/show_bug.cgi?id=645458 --- gtk/gtkstyleproperties.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index c89b31a3b5..38ededc295 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -1243,7 +1243,7 @@ gtk_style_properties_merge (GtkStyleProperties *props, font_desc = g_value_get_boxed (value); font_desc_to_merge = g_value_get_boxed (&data->value); - pango_font_description_merge (font_desc, font_desc_to_merge, FALSE); + pango_font_description_merge (font_desc, font_desc_to_merge, replace); } else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY && G_IS_VALUE (value))