summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-01-14 04:39:07 +0100
committerBenjamin Otte <otte@redhat.com>2012-02-02 03:13:38 +0100
commitf7e0ce3b28ec5d98dd7d4d08bf3c623f5ed09c54 (patch)
tree0a0435016c6d0a63c98c75e40e43325231edfc9d /gtk
parent25affd47661a4b4a309ac314a1a2c4f94bc3795c (diff)
downloadgtk+-f7e0ce3b28ec5d98dd7d4d08bf3c623f5ed09c54.tar.gz
css: Initialize values to their specified type
.. when parsing.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcssstyleproperty.c2
-rw-r--r--gtk/gtkcssstylepropertyimpl.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index 94680389ac..9743b8821b 100644
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -201,7 +201,7 @@ gtk_css_style_property_parse_value (GtkStyleProperty *property,
return TRUE;
}
- g_value_init (value, _gtk_style_property_get_value_type (property));
+ g_value_init (value, _gtk_css_style_property_get_specified_type (style_property));
if (!(* style_property->parse_value) (style_property, value, parser, base))
{
g_value_unset (value);
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index a6b65fe1d0..d41048f328 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -418,8 +418,6 @@ css_image_value_parse (GtkCssStyleProperty *property,
return FALSE;
}
- g_value_unset (value);
- g_value_init (value, GTK_TYPE_CSS_IMAGE);
g_value_take_object (value, image);
return TRUE;
}