[PATCH libXi 2/3] Drop grab_window from XIAllowTouch()

[Peter Hutterer]

grab_window was removed from the protocol, drop it from the public facing
API. This argument was sent to the server but always ignored, clients can be
fixed easily without seeing changed behaviour.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 include/X11/extensions/XInput2.h |    1 -
 src/XIAllowEvents.c              |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index 26de695..0fcddce 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -455,7 +455,6 @@ extern Status XIAllowTouchEvents(
     Display*            display,
     int                 deviceid,
     unsigned int        touchid,
-    Window              grab_window,
     int                 event_mode
 );
 
diff --git a/src/XIAllowEvents.c b/src/XIAllowEvents.c
index 5fa77ca..bb89090 100644
--- a/src/XIAllowEvents.c
+++ b/src/XIAllowEvents.c
@@ -35,7 +35,7 @@
 
 static Status
 _XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time,
-                    unsigned int touchid, Window grab_window)
+                    unsigned int touchid)
 {
     Bool have_XI22 = True;
     xXIAllowEventsReq *req;
@@ -74,12 +74,12 @@ _XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time,
 Status
 XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time)
 {
-    return _XIAllowEvents(dpy, deviceid, event_mode, time, 0, None);
+    return _XIAllowEvents(dpy, deviceid, event_mode, time, 0);
 }
 
 Status
-XIAllowTouchEvents(Display *dpy, int deviceid, unsigned int touchid,
-                   Window grab_window, int event_mode)
+XIAllowTouchEvents(Display *dpy, int deviceid,
+                   unsigned int touchid, int event_mode)
 {
     int status;
     XExtDisplayInfo *extinfo = XInput_find_display(dpy);
@@ -88,7 +88,7 @@ XIAllowTouchEvents(Display *dpy, int deviceid, unsigned int touchid,
     if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == -1)
 	return (NoSuchExtension);
 
-    status = _XIAllowEvents(dpy, deviceid, event_mode, CurrentTime, touchid, grab_window);
+    status = _XIAllowEvents(dpy, deviceid, event_mode, CurrentTime, touchid);
 
     UnlockDisplay(dpy);
     SyncHandle();
-- 
1.7.7.5