gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.

2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 37ff8860779..547a19f4049 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-14  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already
+        has a parent.
+
         * Makefile.in: If AUTO_DEPEND is defined, make gcc generate
         dependency files in deps/. Include those files into Makefile.
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index e972679a572..b182b52e6a7 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3001,6 +3001,9 @@ xg_update_frame_menubar (f)
   if (!x->menubar_widget || GTK_WIDGET_MAPPED (x->menubar_widget))
     return 0;
 
+  if (x->menubar_widget && gtk_widget_get_parent (x->menubar_widget))
+    return 0; /* Already done this, happens for frames created invisible.  */
+
   BLOCK_INPUT;
 
   gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget,