XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into xi2

Browse Source 
Conflicts:
	Xext/geext.c
	Xi/chdevcur.c
	Xi/extgrbdev.c
	Xi/xiproperty.c
	configure.ac
	dix/ptrveloc.c
	hw/xfree86/common/xf86Config.c
	mi/mipointer.h
	test/input.c
	xkb/xkb.c
This commit is contained in:
Peter Hutterer
2009-05-28 17:20:58 +10:00
parent a25f248fc3 e08c6a0752
commit d7aef3f663
178 changed files with 4488 additions and 5411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Xi/chdevcur.c
View File

@@ -94,10 +94,10 @@ int ProcXIChangeCursor(ClientPtr client)
}
else
{
rc = dixLookupResourceByType((pointer*)&pCursor, stuff->cursor,
rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor,
RT_CURSOR, client, DixReadAccess);
if (rc != Success)
return rc;
if (rc != Success)
return (rc == BadValue) ? BadCursor : rc;
}
ChangeWindowDeviceCursor(pWin, pDev, pCursor);