diff options
author | Matthias Clasen <mclasen@redhat.com> | 2005-06-27 18:37:41 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-06-27 18:37:41 +0000 |
commit | c719b4bf3d66b117003e4703eea5e15cfac8ebe5 (patch) | |
tree | 442577d6e5e3bbbb7070682fa6872ba63dceafe3 /ChangeLog.pre-2-10 | |
parent | ddd27f21a68f8f941adfd1f7781d2a882936e768 (diff) | |
download | gdk-pixbuf-c719b4bf3d66b117003e4703eea5e15cfac8ebe5.tar.gz |
Avoid a segfault. (#309054)
2005-06-27 Matthias Clasen <mclasen@redhat.com>
* 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.
Diffstat (limited to 'ChangeLog.pre-2-10')
-rw-r--r-- | ChangeLog.pre-2-10 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 159f002e0..c1352b738 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,18 @@ 2005-06-27 Matthias Clasen <mclasen@redhat.com> + * 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) |