Merge branch 'master' into mpx

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

1 files changed, 1 insertions, 1 deletions

diff --git a/Xi/xiselev.c b/Xi/xiselev.c
index 8740487df..59f75b547 100644
--- a/Xi/xiselev.c
+++ b/Xi/xiselev.c
@@ -64,7 +64,7 @@ ProcXiSelectEvent(ClientPtr client)
     REQUEST(xXiSelectEventReq);
     REQUEST_SIZE_MATCH(xXiSelectEventReq);
 
-    ret = dixLookupWindow(&pWin, stuff->window, client, DixReadWriteAccess);
+    ret = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
     if (ret != Success)
     {
         SendErrorToClient(client, IReqCode, X_XiSelectEvent, 0, ret);