From c719b4bf3d66b117003e4703eea5e15cfac8ebe5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Jun 2005 18:37:41 +0000 Subject: Avoid a segfault. (#309054) 2005-06-27 Matthias Clasen * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Avoid a segfault. (#309054) * gdk/x11/gdkdisplay-x11.h (struct _GdkDisplayX11): Add fields for grab timestamps. * gdk/x11/gdkmain-x11.c (gdk_pointer_grab, gdk_keyboard_grab): Store grab timestamps when grabbing. * gdk/x11/gdkdisplay-x11.c (gdk_display_keyboard_ungrab) (gdk_display_pointer_ungrab): Don't unset the grab_window if the timestamps indicate that the ungrab will fails. --- ChangeLog.pre-2-8 | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'ChangeLog.pre-2-8') diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 159f002e03..c1352b7385 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,18 @@ 2005-06-27 Matthias Clasen + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): + Avoid a segfault. (#309054) + + * gdk/x11/gdkdisplay-x11.h (struct _GdkDisplayX11): Add + fields for grab timestamps. + + * gdk/x11/gdkmain-x11.c (gdk_pointer_grab, gdk_keyboard_grab): + Store grab timestamps when grabbing. + + * gdk/x11/gdkdisplay-x11.c (gdk_display_keyboard_ungrab) + (gdk_display_pointer_ungrab): Don't unset the grab_window + if the timestamps indicate that the ungrab will fails. + * gtk/gtkmenu.c (gtk_menu_grab_notify): Cancel menus when they are grab-shadowed by something thats not a submenu. (#145416, Euan MacGregor) -- cgit v1.2.1