[gtk+] styleproperty: Fall back to default values, instead of recursing

[Benjamin Otte <otte src gnome org>]

commit 8861f6dbfb68d898283d140bdaa6ac304f03f5d5
Author: Benjamin Otte <otte redhat com>
Date:   Sat Jun 11 10:02:58 2011 +0200

    styleproperty: Fall back to default values, instead of recursing
    
    Copy/paste error. The original commit message even explains this.

 gtk/gtkstyleproperty.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 73b09dc..ee3ce04 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -1976,28 +1976,34 @@ _gtk_style_property_resolve (const GtkStyleProperty *property,
     {
       if (property->pspec->value_type == GDK_TYPE_RGBA)
         {
-          if (!resolve_color (props, val))
-            _gtk_style_property_resolve (property, props, val);
+          if (resolve_color (props, val))
+            return;
         }
       else if (property->pspec->value_type == GDK_TYPE_COLOR)
         {
-          if (!resolve_color_rgb (props, val))
-            _gtk_style_property_resolve (property, props, val);
+          if (resolve_color_rgb (props, val))
+            return;
         }
-      else
-        _gtk_style_property_resolve (property, props, val);
+      
+      g_value_unset (val);
+      g_value_init (val, property->pspec->value_type);
+      _gtk_style_property_default_value (property, props, val);
     }
   else if (G_VALUE_TYPE (val) == GTK_TYPE_GRADIENT)
     {
       g_return_if_fail (property->pspec->value_type == CAIRO_GOBJECT_TYPE_PATTERN);
 
       if (!resolve_gradient (props, val))
-        _gtk_style_property_resolve (property, props, val);
+        {
+          g_value_unset (val);
+          g_value_init (val, CAIRO_GOBJECT_TYPE_PATTERN);
+          _gtk_style_property_default_value (property, props, val);
+        }
     }
   else if (G_VALUE_TYPE (val) == GTK_TYPE_SHADOW)
     {
       if (!resolve_shadow (props, val))
-        _gtk_style_property_resolve (property, props, val);
+        _gtk_style_property_default_value (property, props, val);
     }
 }