From 2c535b6f13ffbf2c4ac59834dae39bb8e172c003 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Jul 2009 08:58:23 +1000 Subject: [PATCH] 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 --- dix/devices.c | 13 ------------- 1 file changed, 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