Mercurial > emacs

changeset 71160:070b40db0b2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
author Jan Djärv <jan.h.d@swipnet.se>
date Fri, 02 Jun 2006 08:49:25 +0000
parents 1d3e70a13b74
children 938915517680
files src/ChangeLog src/gtkutil.c
diffstat 2 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jun 02 06:34:41 2006 +0000
+++ b/src/ChangeLog	Fri Jun 02 08:49:25 2006 +0000
@@ -1,3 +1,7 @@
+2006-06-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
+
 2006-06-01  Richard Stallman  <rms@gnu.org>
 
 	* window.c (Fsplit_window): Doc fix.
--- a/src/gtkutil.c	Fri Jun 02 06:34:41 2006 +0000
+++ b/src/gtkutil.c	Fri Jun 02 08:49:25 2006 +0000
@@ -1981,16 +1981,20 @@
      gpointer data;
 {
   FRAME_PTR f = (FRAME_PTR) data;
-  Display *dpy = FRAME_X_DISPLAY (f);
-
-  BLOCK_INPUT;
+
+  if (FRAME_X_OUTPUT (f)->menubar_widget)
+    {
       GtkMenuShell *w = GTK_MENU_SHELL (FRAME_X_OUTPUT (f)->menubar_widget);
+      Display *dpy = FRAME_X_DISPLAY (f);
+
+      BLOCK_INPUT;
       gtk_menu_shell_deactivate (w);
       gtk_menu_shell_deselect (w);
 
-  XUngrabKeyboard (dpy, CurrentTime);
-  XUngrabPointer (dpy, CurrentTime);
-  UNBLOCK_INPUT;
+      XUngrabKeyboard (dpy, CurrentTime);
+      XUngrabPointer (dpy, CurrentTime);
+      UNBLOCK_INPUT;
+    }
 }