Commit 95931e18 authored by Stuart Parmenter's avatar Stuart Parmenter

merges from stable branch

parent 2d49bbb0
......@@ -365,7 +365,20 @@ gtk_style_copy (GtkStyle *style)
gdk_font_unref (new_style->font);
new_style->font = style->font;
gdk_font_ref (new_style->font);
if (style->rc_style)
{
new_style->rc_style = style->rc_style;
gtk_rc_style_ref (style->rc_style);
}
if (style->engine)
{
new_style->engine = style->engine;
gtk_theme_engine_ref(new_style->engine);
new_style->engine->duplicate_style (new_style, style);
}
return new_style;
}
......@@ -381,18 +394,6 @@ gtk_style_duplicate (GtkStyle *style)
style->styles = g_slist_append (style->styles, new_style);
new_style->styles = style->styles;
if (style->rc_style)
{
new_style->rc_style = style->rc_style;
gtk_rc_style_ref (style->rc_style);
}
if (style->engine)
{
new_style->engine = style->engine;
new_style->engine->duplicate_style (new_style, style);
}
return new_style;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment