From ccdab9e4cdff670cbab8133eef5bda673e8566ab Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 30 Sep 2009 00:00:36 +0200 Subject: [PATCH] Make updagin the image window's ui manager more sane (gimp_image_window_image_notify): update the ui manager unconditionally (both when a display is emptied *and* filled) (gui_display_create): remove updating code here. It was not belonging here anyway and the image window does the right thing now. --- app/display/gimpimagewindow.c | 3 ++- app/gui/gui-vtable.c | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c index e6b05dd620..bd5ba4f647 100644 --- a/app/display/gimpimagewindow.c +++ b/app/display/gimpimagewindow.c @@ -1006,8 +1006,9 @@ gimp_image_window_image_notify (GimpDisplay *display, gtk_window_unmaximize (GTK_WINDOW (window)); gtk_window_resize (GTK_WINDOW (window), width, height); - gimp_ui_manager_update (private->menubar_manager, display); } + + gimp_ui_manager_update (private->menubar_manager, display); } static void diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c index 7aba2c316e..bd7b3e0549 100644 --- a/app/gui/gui-vtable.c +++ b/app/gui/gui-vtable.c @@ -357,15 +357,6 @@ gui_display_create (Gimp *gimp, gimp_context_set_display (context, display); } - /* FIXME image window: do this elsewhere */ - { - GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (display->shell); - GimpImageWindow *window = gimp_display_shell_get_window (shell); - GimpUIManager *manager = gimp_image_window_get_ui_manager (window); - - gimp_ui_manager_update (manager, display); - } - return GIMP_OBJECT (display); }