From ba7141b92e47ffb75131d77f2fe5589d8e3010db Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 7 Apr 2012 07:38:35 +0200 Subject: [PATCH] shorthand: Fix border query functions We haven't been using ints there for a while, I wonder why that never blew up... --- gtk/gtkcssshorthandpropertyimpl.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c index b9fb42ba89..9f72a2bbee 100644 --- a/gtk/gtkcssshorthandpropertyimpl.c +++ b/gtk/gtkcssshorthandpropertyimpl.c @@ -659,24 +659,27 @@ pack_border (GtkCssShorthandProperty *shorthand, { GtkCssStyleProperty *prop; GtkBorder border; - GtkCssValue *v; + GValue v; prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 0); - v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data); - if (v) - border.top = _gtk_css_value_get_int (v); + _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data); + border.top = g_value_get_int (&v); + g_value_unset (&v); + prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 1); - v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data); - if (v) - border.right = _gtk_css_value_get_int (v); + _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data); + border.right = g_value_get_int (&v); + g_value_unset (&v); + prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 2); - v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data); - if (v) - border.bottom = _gtk_css_value_get_int (v); + _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data); + border.bottom = g_value_get_int (&v); + g_value_unset (&v); + prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 3); - v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data); - if (v) - border.left = _gtk_css_value_get_int (v); + _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data); + border.left = g_value_get_int (&v); + g_value_unset (&v); g_value_init (value, GTK_TYPE_BORDER); g_value_set_boxed (value, &border);