Merge branch 'master' into xi2

This commit is contained in:
Peter Hutterer 2009-04-07 19:36:27 +10:00
commit 6c3b633299
75 changed files with 548 additions and 754 deletions

View file

@ -1734,7 +1734,7 @@ AllowSome(ClientPtr client,
{
if (dev == thisDev)
continue;
devgrabinfo = (core) ? &dev->deviceGrab : &dev->deviceGrab;
devgrabinfo = &dev->deviceGrab;
if (devgrabinfo->grab
&& SameClient(devgrabinfo->grab, client))
devgrabinfo->sync.state = THAWED;