diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-14 08:58:23 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-14 09:00:35 +1000 |
| commit | 2c535b6f13ffbf2c4ac59834dae39bb8e172c003 (patch) | |
| tree | 32c7e8b4e7913fd8d65a191e32240c83038b876f | |
| parent | 0c0ef42292f4c910c73b308cd75d77637312da53 (diff) | |
dix: don't send presence events for attaching/detaching slave devices.
The code that didn't list attached slave devices for XI1 clients doesn't
exist anymore, so there's no need for these presence events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/devices.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/dix/devices.c b/dix/devices.c index 8fac981bf..9f2cb2b1e 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2391,11 +2391,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) InitializeSprite(dev, currentRoot); dev->spriteInfo->spriteOwner = FALSE; dev->spriteInfo->paired = dev; - - /* Floating an SD makes it appear to XI 1 clients */ - SendDevicePresenceEvent(dev->id, DeviceAdded); - if (dev->enabled) - SendDevicePresenceEvent(dev->id, DeviceEnabled); } else { dev->spriteInfo->sprite = master->spriteInfo->sprite; @@ -2403,14 +2398,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) dev->spriteInfo->spriteOwner = FALSE; RecalculateMasterButtons(master); - - if (!oldmaster) - { - /* Attaching a floating SD makes it disappear to XI 1 clients */ - if (dev->enabled) - SendDevicePresenceEvent(dev->id, DeviceDisabled); - SendDevicePresenceEvent(dev->id, DeviceRemoved); - } } /* If we were connected to master device before, this MD may need to |