borderimage: No need to resolve

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

diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 5ad1a014505a4245b32cf0a2ac6628ebd499d82c..5e105a75a02433d643fc9cc06a025c4a7cd8150f 100644 (file)
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -1915,29 +1915,6 @@ resolve_shadow (GtkStyleProperties *props,
   return TRUE;
 }
 
-static gboolean
-resolve_border_image (GtkStyleProperties *props,
-                      GValue *value)
-{
-  GtkBorderImage *resolved, *base;
-
-  base = g_value_get_boxed (value);
-
-  if (base == NULL)
-    return FALSE;
-
-  if (_gtk_border_image_get_resolved (base))
-    return TRUE;
-
-  resolved = _gtk_border_image_resolve (base, props);
-  if (resolved == NULL)
-    return FALSE;
-
-  g_value_take_boxed (value, resolved);
-
-  return TRUE;
-}
-
 void
 _gtk_style_property_resolve (const GtkStyleProperty *property,
                              GtkStyleProperties     *props,
@@ -1970,11 +1947,6 @@ _gtk_style_property_resolve (const GtkStyleProperty *property,
       if (!resolve_shadow (props, val))
         _gtk_style_property_resolve (property, props, val);
     }
-  else if (G_VALUE_TYPE (val) == GTK_TYPE_BORDER_IMAGE)
-    {
-      if (!resolve_border_image (props, val))
-        _gtk_style_property_resolve (property, props, val);
-    }
 }
 
 gboolean