[gimp] Go via the toplevel to update the image window's ui manager

[Michael Natterer <mitch src gnome org>]

commit abc5e270b37e00e9af8185285775098f914345d8
Author: Michael Natterer <mitch gimp org>
Date:   Fri Sep 25 14:21:33 2009 +0200

    Go via the toplevel to update the image window's ui manager

 app/display/gimpdisplayshell.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 90df859..2a66392 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -1652,16 +1652,21 @@ gimp_display_shell_flush (GimpDisplayShell *shell,
     }
   else
     {
-      GimpContext *user_context;
+      GtkWidget       *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
+      GimpImageWindow *window   = GIMP_IMAGE_WINDOW (toplevel);
+      GimpContext     *context;
 
-      /* FIXME image window */
-      gimp_ui_manager_update (GIMP_IMAGE_WINDOW (shell)->menubar_manager,
-                              shell->display);
+      if (gimp_image_window_get_active_display (window) == shell->display)
+        {
+          gimp_ui_manager_update (window->menubar_manager, shell->display);
+        }
 
-      user_context = gimp_get_user_context (shell->display->gimp);
+      context = gimp_get_user_context (shell->display->gimp);
 
-      if (shell->display == gimp_context_get_display (user_context))
-        gimp_ui_manager_update (shell->popup_manager, shell->display);
+      if (shell->display == gimp_context_get_display (context))
+        {
+          gimp_ui_manager_update (shell->popup_manager, shell->display);
+        }
     }
 }