diff options
| author | Keith Packard <keithp@keithp.com> | 2010-02-24 09:59:19 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-02-24 09:59:19 -0800 |
| commit | 780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed (patch) | |
| tree | 054d1de42ea82b8bd34f7fe4b706a3307acc58e5 | |
| parent | 018b177591c9fade6d065e31858cc6e054d33eff (diff) | |
| parent | 758f6971750ed507e64eee817d720a77181439f2 (diff) | |
Merge remote branch 'whot/for-keith'
| -rw-r--r-- | dix/devices.c | 8 | ||||
| -rw-r--r-- | dix/events.c | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/dix/devices.c b/dix/devices.c index b002150d0..6119dcebb 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2020,14 +2020,6 @@ ProcBell(ClientPtr client) return BadValue; } - /* Seems like no keyboard actually has the BellProc set. Returning - * BadDevice (previous code) will make apps crash badly. The man pages - * doesn't say anything about a BadDevice being returned either. - * So just quietly do nothing and pretend everything has worked. - */ - if (!keybd->kbdfeed->BellProc) - return Success; - newpercent = (base * stuff->percent) / 100; if (stuff->percent < 0) newpercent = base + newpercent; diff --git a/dix/events.c b/dix/events.c index 2e947268a..8af8c5ac7 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1414,11 +1414,6 @@ CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode) thisDev->deviceGrab.sync.other = NullGrab; } - /* - XXX: Direct slave grab won't freeze the paired master device. - The correct thing to do would be to freeze all SDs attached to the - paired master device. - */ if (IsMaster(thisDev)) { dev = GetPairedDevice(thisDev); |