[Emacs-diffs] emacs/src ChangeLog gtkutil.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/14 18:22:36

Modified files:
        src            : ChangeLog gtkutil.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7868&r2=1.7869
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.164&r2=1.165

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7868
retrieving revision 1.7869
diff -u -b -r1.7868 -r1.7869
--- ChangeLog   14 Nov 2009 15:17:41 -0000      1.7868
+++ ChangeLog   14 Nov 2009 18:22:34 -0000      1.7869
@@ -1,5 +1,8 @@
 2009-11-14  Jan Djärv  <address@hidden>
 
+       * 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.
 

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- gtkutil.c   11 Nov 2009 20:11:54 -0000      1.164
+++ gtkutil.c   14 Nov 2009 18:22:36 -0000      1.165
@@ -3001,6 +3001,9 @@
   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,