From f789408f7dbfe57a0111e185ac83d1c70f262ba8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Aug 2008 14:52:35 +0930 Subject: [PATCH] Xi: remove broken SDeviceEnterNotifyEvent, replace with ...Leave... The event format is the same for both (bar the type), so one is enough. --- Xi/extinit.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Xi/extinit.c b/Xi/extinit.c index d8714ba7c..595e3582f 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -610,16 +610,6 @@ SDevicePropertyNotifyEvent (devicePropertyNotify *from, devicePropertyNotify *to swapl(&to->atom, n); } -static void -SDeviceEnterNotifyEvent (deviceEnterNotify *from, deviceEnterNotify *to) -{ - char n; - - *to = *from; - swaps(&to->sequenceNumber,n); - swapl(&to->time, n); -} - static void SDeviceLeaveNotifyEvent (deviceLeaveNotify *from, deviceLeaveNotify *to) { @@ -1102,7 +1092,7 @@ SEventIDispatch(xEvent * from, xEvent * to) else if (type == DevicePropertyNotify) DO_SWAP(SDevicePropertyNotifyEvent, devicePropertyNotify); else if (type == DeviceEnterNotify) - DO_SWAP(SDeviceEnterNotifyEvent, deviceEnterNotify); + DO_SWAP(SDeviceLeaveNotifyEvent, deviceEnterNotify); else if (type == DeviceLeaveNotify) DO_SWAP(SDeviceLeaveNotifyEvent, deviceLeaveNotify); else {