summaryrefslogtreecommitdiff
path: root/gtk/gtkcssshorthandproperty.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-03-26 07:08:24 +0200
committerBenjamin Otte <otte@redhat.com>2012-04-17 08:59:11 +0200
commit5ac9ba714ae480b8abfa918448ec07e5bf330da0 (patch)
tree1d250787adc88618406398d5f5f7d24df3cb51d8 /gtk/gtkcssshorthandproperty.c
parent58e4fdf911377c303858d0eebbd2594505dd3a21 (diff)
downloadgtk+-5ac9ba714ae480b8abfa918448ec07e5bf330da0.tar.gz
styleproperty: Make _gtk_style_property_query() take a GValue
... and don't make it return a GtkCssValue. We want to use this for compat with the old GValue APIs after all...
Diffstat (limited to 'gtk/gtkcssshorthandproperty.c')
-rw-r--r--gtk/gtkcssshorthandproperty.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index f9617914ab..6905b4568a 100644
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -72,14 +72,15 @@ _gtk_css_shorthand_property_assign (GtkStyleProperty *property,
shorthand->assign (shorthand, props, state, value);
}
-static GtkCssValue *
+static void
_gtk_css_shorthand_property_query (GtkStyleProperty *property,
+ GValue *value,
GtkStyleQueryFunc query_func,
gpointer query_data)
{
GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property);
- return shorthand->query (shorthand, query_func, query_data);
+ return shorthand->query (shorthand, value, query_func, query_data);
}
static void