[Xfce4-commits] <ristretto:master> Fix crash introduced with previous commit

[Stephan Arts]

Updating branch refs/heads/master
         to 8d1ea5548445bafe62cd1651c241dbb231cce121 (commit)
       from 8a3747881a8336e9f06bed41eafd5f2e13d90f2a (commit)

commit 8d1ea5548445bafe62cd1651c241dbb231cce121
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Oct 16 17:21:15 2011 +0200

    Fix crash introduced with previous commit

 src/xfce_wallpaper_manager.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index f79ea0c..aded7b3 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -291,15 +291,12 @@ rstto_xfce_wallpaper_manager_init (GObject *object)
     GdkScreen *screen = gdk_screen_get_default ();
     gint n_monitors = gdk_screen_get_n_monitors (screen);
     GdkRectangle monitor_geometry;
-    GtkWidget *vbox = gtk_dialog_get_content_area (
-            GTK_DIALOG (manager->priv->dialog));
+    GtkWidget *vbox;
     GtkWidget *style_label = gtk_label_new( _("Style:"));
     GtkWidget *brightness_label = gtk_label_new( _("Brightness:"));
     GtkWidget *saturation_label = gtk_label_new( _("Saturation:"));
-    GtkWidget *brightness_slider = gtk_hscale_new (
-            GTK_ADJUSTMENT (manager->priv->brightness_adjustment));
-    GtkWidget *saturation_slider = gtk_hscale_new (
-            GTK_ADJUSTMENT (manager->priv->saturation_adjustment));
+    GtkWidget *brightness_slider;
+    GtkWidget *saturation_slider;
     GtkWidget *image_prop_table = gtk_table_new (3, 2, FALSE);
 
 
@@ -324,6 +321,7 @@ rstto_xfce_wallpaper_manager_init (GObject *object)
             GTK_STOCK_OK,
             GTK_RESPONSE_OK,
             NULL);
+    vbox = gtk_dialog_get_content_area ( GTK_DIALOG (manager->priv->dialog));
     manager->priv->brightness_adjustment = gtk_adjustment_new (
             0.0,
             -128.0,
@@ -338,6 +336,10 @@ rstto_xfce_wallpaper_manager_init (GObject *object)
             0.1,
             0.5,
             0.0);
+    brightness_slider = gtk_hscale_new (
+            GTK_ADJUSTMENT (manager->priv->brightness_adjustment));
+    saturation_slider = gtk_hscale_new (
+            GTK_ADJUSTMENT (manager->priv->saturation_adjustment));
     manager->priv->monitor_chooser = rstto_monitor_chooser_new ();
     manager->priv->style_combo = gtk_combo_box_new_text();