From 3e24b5dbbec0161aa28dc32aac52d6c9e8f9a980 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 31 Dec 2011 01:14:47 +0100 Subject: styleproperty: Add _gtk_style_property_query() This way, we only need to export one function, not 3. --- gtk/gtkstyleproperties.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gtk/gtkstyleproperties.c') diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index 08ed39bcf9..48dc88b11e 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -744,7 +744,6 @@ _gtk_style_properties_get_property (GtkStyleProperties *props, GValue *value) { const GtkStyleProperty *node; - const GValue *val; g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE); g_return_val_if_fail (property != NULL, FALSE); @@ -757,16 +756,7 @@ _gtk_style_properties_get_property (GtkStyleProperties *props, return FALSE; } - val = _gtk_style_properties_peek_property (props, node, state); - g_value_init (value, node->pspec->value_type); - - if (val) - _gtk_style_property_resolve (node, props, state, context, (GValue *) val, value); - else if (_gtk_style_property_is_shorthand (node)) - _gtk_style_property_pack (node, props, state, context, value); - else - _gtk_style_property_default_value (node, props, state, value); - + _gtk_style_property_query (node, props, state, context, value); return TRUE; } -- cgit v1.2.1