diff options
author | Benjamin Otte <otte@redhat.com> | 2011-12-31 01:14:47 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2012-01-09 18:37:51 +0100 |
commit | 3e24b5dbbec0161aa28dc32aac52d6c9e8f9a980 (patch) | |
tree | 1d4a681d784fe80c7353c3b8bb61d3e2f3a7ed9d /gtk/gtkstyleproperties.c | |
parent | 2573e72f496fe252c452ca9bdff03b70c6926d2a (diff) | |
download | gtk+-3e24b5dbbec0161aa28dc32aac52d6c9e8f9a980.tar.gz |
styleproperty: Add _gtk_style_property_query()
This way, we only need to export one function, not 3.
Diffstat (limited to 'gtk/gtkstyleproperties.c')
-rw-r--r-- | gtk/gtkstyleproperties.c | 12 |
1 files changed, 1 insertions, 11 deletions
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; } |