[Goodies-commits] r3649 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-11-27 22:23:05 +0000 (Tue, 27 Nov 2007)
New Revision: 3649

Modified:
   ristretto/trunk/src/main_window.c
Log:
Fix some preferences dialog issues



Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2007-11-27 22:14:02 UTC (rev 3648)
+++ ristretto/trunk/src/main_window.c	2007-11-27 22:23:05 UTC (rev 3649)
@@ -1151,10 +1151,6 @@
     {
         color = gdk_color_copy(rstto_picture_viewer_get_bg_color(RSTTO_PICTURE_VIEWER(window->priv->picture_viewer)));
     }
-    else
-    {
-        color = g_new0(GdkColor, 1);
-    }
     GtkWidget *slideshow_main_vbox;
     GtkWidget *slideshow_main_lbl;
     GtkWidget *display_main_vbox;
@@ -1187,11 +1183,16 @@
     GtkWidget *bg_color_frame = xfce_create_framebox_with_content (_("Background Color"), bg_color_vbox);
 
     GtkWidget *bg_color_override_check = gtk_check_button_new_with_mnemonic(_("_Override Background Color"));
-    GtkWidget *bg_color_button = gtk_color_button_new_with_color(color);
-
+    GtkWidget *bg_color_button = gtk_color_button_new();
     gtk_box_pack_start(GTK_BOX(bg_color_vbox), bg_color_override_check, FALSE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(bg_color_vbox), bg_color_button, FALSE, FALSE, 0);
 
+    if (color)
+    {
+        gtk_color_button_set_color(GTK_COLOR_BUTTON(bg_color_button), color);
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bg_color_override_check), TRUE);
+    }
+
     gtk_container_set_border_width (GTK_CONTAINER (bg_color_frame), 8);
 
     gtk_box_pack_start(GTK_BOX(display_main_vbox), bg_color_frame, FALSE, TRUE, 0);
@@ -1242,6 +1243,10 @@
             window->priv->navigator->preload = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(preload_check));
             if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(bg_color_override_check)) == TRUE)
             {
+                if (color == NULL)
+                {
+                    color = g_new0(GdkColor, 1);
+                }
                 gtk_color_button_get_color(GTK_COLOR_BUTTON(bg_color_button), color);
                 rstto_main_window_set_pv_bg_color(window, color);
                 gdk_color_free(color);