stylecontext: Do invalidation on first resize container

[~andy/gtk] / gtk / gtkcssshorthandproperty.c

diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index f10201d31cdf257cddc830a42e16610c2f7691ec..c6ca6146890cae4c12db2c4dab906d319805657a 100644 (file)
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -86,8 +86,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty   *property,
 
 static GtkCssValue *
 gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
-                                        GtkCssParser     *parser,
-                                        GFile            *base)
+                                        GtkCssParser     *parser)
 {
   GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property);
   GtkCssValue **data;
@@ -119,7 +118,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
           data[i] = _gtk_css_inherit_value_new ();
         }
     }
-  else if (!shorthand->parse (shorthand, data, parser, base))
+  else if (!shorthand->parse (shorthand, data, parser))
     {
       for (i = 0; i < shorthand->subproperties->len; i++)
         {
@@ -139,7 +138,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
         data[i] = _gtk_css_initial_value_new ();
     }
 
-  result = _gtk_css_array_value_new (data, shorthand->subproperties->len);
+  result = _gtk_css_array_value_new_from_array (data, shorthand->subproperties->len);
   g_free (data);
   
   return result;