From d9e3782391a7eebe76743b4bd335d2857ed52d02 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 4 Aug 2010 17:50:52 +0200
Subject: [PATCH] GtkStyleSet: Fix compiler warning.

---
 gtk/gtkstyleset.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkstyleset.c b/gtk/gtkstyleset.c
index d2053db7ac..e8b96cc1cc 100644
--- a/gtk/gtkstyleset.c
+++ b/gtk/gtkstyleset.c
@@ -601,7 +601,7 @@ gtk_style_set_get_valist (GtkStyleSet  *set,
         }
       else
         {
-          GValue *val;
+          GValue *val = NULL;
 
           if (prop)
             {
@@ -610,7 +610,8 @@ gtk_style_set_get_valist (GtkStyleSet  *set,
               else if (G_IS_VALUE (&prop->default_value))
                 val = &prop->default_value;
             }
-          else
+
+          if (!val)
             val = &node->default_value;
 
           if (G_VALUE_TYPE (val) == GTK_TYPE_SYMBOLIC_COLOR)