libx11: Changes to 'upstream-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 modules/im/ximcp/imDefLkup.c |    2 +-
 src/GetMoEv.c                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e76bcf3cafda85058ce5f35f1f81929f4772f72
Author: Olivier Blin <blino@mandriva.org>
Date:   Mon Jun 11 18:32:09 2007 +1000

    fix XGetMotionEvents arguments order - Fixes bug 11222

diff --git a/src/GetMoEv.c b/src/GetMoEv.c
index 2aa6c1a..dac1bfc 100644
--- a/src/GetMoEv.c
+++ b/src/GetMoEv.c
@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group.
 
 XTimeCoord *XGetMotionEvents(
     register Display *dpy,
+    Window w,
     Time start, 
     Time stop,
-    Window w,
     int *nEvents)  /* RETURN */
 {       
     xGetMotionEventsReply rep;

commit c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
Author: Jamey Sharp <jamey@minilop.net>
Date:   Sun Jun 10 16:19:59 2007 -0700

    Fix locking in _XimGetWindowEventmask.
    
    Now that XFilterEvent drops the Display lock before invoking callback
    functions, _XimGetWindowEventmask is called without the lock held. So
    when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
    that does not lock the Display, Xlib/XCB would assert:
    
    xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
    
    Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?

diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index aa1aaaf..157b076 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -466,7 +466,7 @@ _XimGetWindowEventmask(
     Xim			im = (Xim )ic->core.im;
     XWindowAttributes	atr;
 
-    if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
+    if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
 	return 0;
     return (EVENTMASK)atr.your_event_mask;
 }