AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkCssProvider: Use default value when handling "none".

Browse Source 
This way the default value has a way to override other values in previous
GtkStyleProviders when merged.
This commit is contained in:
Carlos Garnacho 2010-11-21 19:36:59 +01:00
parent 5e26fb75a0
commit ee37847952
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcssprovider.c
View File

@ -2964,8 +2964,11 @@ parse_rule (GtkCssProvider *css_provider,
if (strcmp (value_str, "none") == 0)
{
/* Remove/unset the current value */
g_hash_table_remove (priv->cur_properties, prop);
/* Insert the default value, so it has an opportunity
* to override other style providers when merged
*/
g_param_value_set_default (pspec, val);
g_hash_table_insert (priv->cur_properties, prop, val);
}
else if (pspec->value_type == G_TYPE_STRING)
{