gimp r25183 - in trunk: . app/display

[mitch svn gnome org]

Author: mitch
Date: Sun Mar 23 16:24:35 2008
New Revision: 25183
URL: http://svn.gnome.org/viewvc/gimp?rev=25183&view=rev

Log:
2008-03-23  Michael Natterer  <mitch gimp org>

	* app/display/gimpdisplayshell.c (gimp_display_shell_new): use the
	right GimpDisplayOptions to set the initial visibility of the
	shell's widgets.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell.c

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Sun Mar 23 16:24:35 2008
@@ -675,6 +675,7 @@
                         GimpDialogFactory *display_factory)
 {
   GimpDisplayShell      *shell;
+  GimpDisplayOptions    *options;
   GimpColorDisplayStack *filter;
   GtkWidget             *main_vbox;
   GtkWidget             *disp_vbox;
@@ -706,11 +707,15 @@
 
   if (shell->display->image)
     {
+      options = shell->options;
+
       image_width  = gimp_image_get_width  (shell->display->image);
       image_height = gimp_image_get_height (shell->display->image);
     }
   else
     {
+      options = shell->no_image_options;
+
       image_width  = GIMP_DEFAULT_IMAGE_WIDTH;
       image_height = GIMP_DEFAULT_IMAGE_HEIGHT;
     }
@@ -818,7 +823,7 @@
     {
       gtk_box_pack_start (GTK_BOX (main_vbox), shell->menubar, FALSE, FALSE, 0);
 
-      if (shell->options->show_menubar)
+      if (options->show_menubar)
         gtk_widget_show (shell->menubar);
       else
         gtk_widget_hide (shell->menubar);
@@ -1100,7 +1105,7 @@
 
   /*  show everything  *******************************************************/
 
-  if (shell->options->show_rulers)
+  if (options->show_rulers)
     {
       gtk_widget_show (shell->origin);
       gtk_widget_show (shell->hrule);
@@ -1109,7 +1114,7 @@
 
   gtk_widget_show (GTK_WIDGET (shell->canvas));
 
-  if (shell->options->show_scrollbars)
+  if (options->show_scrollbars)
     {
       gtk_widget_show (shell->vsb);
       gtk_widget_show (shell->hsb);
@@ -1118,7 +1123,7 @@
       gtk_widget_show (shell->nav_ebox);
     }
 
-  if (shell->options->show_statusbar)
+  if (options->show_statusbar)
     gtk_widget_show (shell->statusbar);
 
   gtk_widget_show (main_vbox);