From 89c1d93b68aaaebeb5db0dc2a58895721c6665aa Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Thu, 17 Mar 2011 14:31:57 -0400
Subject: [PATCH] styleproperties: don't force replacing the font description

Otherwise custom fonts will always get overridden by the default stored
in GtkSettings when merging them.

https://bugzilla.gnome.org/show_bug.cgi?id=644975
---
 gtk/gtkstyleproperties.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index 38ededc295..c89b31a3b5 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, replace);
+              pango_font_description_merge (font_desc, font_desc_to_merge, FALSE);
             }
           else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY &&
                    G_IS_VALUE (value))