[gimp] Move the last window-related NIW code from the shell to the image window



commit fdd55d37cbec3598b0614b730b39d9eb1b245ea7
Author: Michael Natterer <mitch gimp org>
Date:   Fri Sep 25 12:09:15 2009 +0200

    Move the last window-related NIW code from the shell to the image window

 app/display/gimpdisplayshell.c |    5 -----
 app/display/gimpimagewindow.c  |    9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index f588d2e..ad9dbc1 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -1256,11 +1256,6 @@ gimp_display_shell_new (GimpDisplay       *display,
     }
   else
     {
-      /* FIXME image window */
-      gimp_statusbar_empty (GIMP_STATUSBAR (GIMP_IMAGE_WINDOW (shell)->statusbar));
-      gimp_dialog_factory_add_foreign (display_factory,
-                                       "gimp-empty-image-window",
-                                       GTK_WIDGET (shell));
       gimp_help_set_help_data (shell->canvas,
                                _("Drop image files here to open them"),
                                NULL);
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 3d1bfc7..5ace858 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -449,6 +449,15 @@ gimp_image_window_set_active_display (GimpImageWindow *window,
                     G_CALLBACK (gimp_image_window_shell_icon_notify),
                     window);
 
+  if (! display->image)
+    {
+      gimp_statusbar_empty (GIMP_STATUSBAR (window->statusbar));
+
+      gimp_dialog_factory_add_foreign (window->display_factory,
+                                       "gimp-empty-image-window",
+                                       GTK_WIDGET (window));
+    }
+
   gimp_ui_manager_update (window->menubar_manager,
                           window->active_display);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]