Hello community, here is the log from the commit of package xorg-x11 checked in at Fri Jun 9 02:51:55 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-06-02 16:22:49.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-06-08 12:45:02.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 8 12:44:24 CEST 2006 - sndirsch@suse.de + +- p_xnest-ignore-getimage-errors.diff: + * ignores the X error on GetImage in Xnest (Bug #174228) + +------------------------------------------------------------------- New: ---- p_xnest-ignore-getimage-errors.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.8OBCMS/_old 2006-06-09 02:50:53.000000000 +0200 +++ /var/tmp/diff_new_pack.8OBCMS/_new 2006-06-09 02:50:53.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 57 +Release: 58 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -124,6 +124,7 @@ Patch365: p_xorg-fbcompose-radek2.diff Patch366: pc_xf86-pci.diff Patch367: p_xlib_skip_ext_env.diff +Patch368: p_xnest-ignore-getimage-errors.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1563,6 +1564,7 @@ pushd lib/X11 %patch367 -p0 popd +%patch368 # UTS_RELEASE=`uname -r` UTS_MAJOR=${UTS_RELEASE%%%%.*} @@ -2720,6 +2722,9 @@ %clean %changelog -n xorg-x11 +* Thu Jun 08 2006 - sndirsch@suse.de +- p_xnest-ignore-getimage-errors.diff: + * ignores the X error on GetImage in Xnest (Bug #174228) * Fri Jun 02 2006 - sndirsch@suse.de - pc_xf86-pci.diff: * fixes broken BIOS reading (due to changes in recent Linux ++++++ p_xnest-ignore-getimage-errors.diff ++++++ Index: programs/Xserver/hw/xnest/GCOps.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/GCOps.c,v retrieving revision 1.6 diff -u -p -r1.6 GCOps.c --- programs/Xserver/hw/xnest/GCOps.c 14 Jul 2005 03:36:43 -0000 1.6 +++ programs/Xserver/hw/xnest/GCOps.c 7 Jun 2006 13:40:01 -0000 @@ -96,6 +96,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP } } +static int +xnestIgnoreErrorHandler (Display *display, + XErrorEvent *event) +{ + return False; /* return value is ignored */ +} + void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, unsigned int format, unsigned long planeMask, @@ -103,9 +110,13 @@ xnestGetImage(DrawablePtr pDrawable, int { XImage *ximage; int length; + int (*old_handler)(Display*, XErrorEvent*); + /* we may get BadMatch error when xnest window is minimized */ + old_handler = XSetErrorHandler (xnestIgnoreErrorHandler); ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable), x, y, w, h, planeMask, format); + XSetErrorHandler (old_handler); if (ximage) { length = ximage->bytes_per_line * ximage->height; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de