From: Jan Djärv Date: Sat, 14 Nov 2009 18:22:34 +0000 (+0000) Subject: gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent. X-Git-Tag: emacs-pretest-23.1.90~434 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=473a99b7c9a8f9a922ad44993596089aabd08dd1;p=emacs.git gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent. --- 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 + * 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,