Commit 8b2b00f5 authored by Jan Djärv's avatar Jan Djärv
Browse files

* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.

parent 62e51d53
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> 2006-06-01 Richard Stallman <rms@gnu.org>
   
* window.c (Fsplit_window): Doc fix. * window.c (Fsplit_window): Doc fix.
......
...@@ -1981,16 +1981,20 @@ menu_nav_ended (wmenu, data) ...@@ -1981,16 +1981,20 @@ menu_nav_ended (wmenu, data)
gpointer data; gpointer data;
{ {
FRAME_PTR f = (FRAME_PTR) 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); 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_deactivate (w);
gtk_menu_shell_deselect (w); gtk_menu_shell_deselect (w);
XUngrabKeyboard (dpy, CurrentTime); XUngrabKeyboard (dpy, CurrentTime);
XUngrabPointer (dpy, CurrentTime); XUngrabPointer (dpy, CurrentTime);
UNBLOCK_INPUT; UNBLOCK_INPUT;
}
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment