dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bill Skaggs <weskaggs@primate.ucdavis.edu> 

* plug-ins/common/screenshot.c: trap errors when running
	XGrabKey, to prevent bail-out on BadAccess error as
	reported by Jean-Luc Coulon on developers list; solution
	suggested by Simon Budig.
This commit is contained in:
William Skaggs 2005-06-02 18:03:50 +00:00
parent 8114272551
commit c635b2be13
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-06-01 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* plug-ins/common/screenshot.c: trap errors when running
XGrabKey, to prevent bail-out on BadAccess error as
reported by Jean-Luc Coulon on developers list; solution
suggested by Simon Budig.
2005-06-02 Raphaël Quinet <raphael@gimp.org> 2005-06-02 Raphaël Quinet <raphael@gimp.org>
* data/images/gimp-splash.png: New splash. A twist on the * data/images/gimp-splash.png: New splash. A twist on the

3
plug-ins/common/screenshot.c
View File

@ -425,8 +425,11 @@ select_window_x11 (GdkScreen *screen)
if (gdk_keymap_get_entries_for_keyval (NULL, GDK_Escape, &keys, &num_keys)) if (gdk_keymap_get_entries_for_keyval (NULL, GDK_Escape, &keys, &num_keys))
{ {
gdk_error_trap_push ();
XGrabKey (x_dpy, keys[0].keycode, AnyModifier, x_root, False, XGrabKey (x_dpy, keys[0].keycode, AnyModifier, x_root, False,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
gdk_flush ();
gdk_error_trap_pop ();
} }
while (! cancel && ((x_win == None) || (buttons != 0))) while (! cancel && ((x_win == None) || (buttons != 0)))