diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-08 11:01:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-05 07:33:10 +1000 |
| commit | b2cc4f5c4aa35fb13d96fafdbd907b6dba4b4796 (patch) | |
| tree | 1b116fc25b49e95b0dc50ba4b722887789b6a74a | |
| parent | 6f61aa776332b99e0d3cc035bff11d87d2735a47 (diff) | |
Remove the need for XI86_CONFIGURED on input-ABI 12
Just move the assignment into an already if GET_ABI_MAJOR() block.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | src/synaptics.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index f64a081..872930c 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -80,12 +80,6 @@ #include <ptrveloc.h> #endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -/* removed from server, purge when dropping support for server 1.10 */ -#define XI86_CONFIGURED 0x02 -#define XI86_SEND_DRAG_EVENTS 0x08 -#endif - typedef enum { NO_EDGE = 0, BOTTOM_EDGE = 1, @@ -676,6 +670,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) if (NewSynapticsPreInit(drv, pInfo, flags) != Success) return NULL; + pInfo->flags |= XI86_CONFIGURED; + return pInfo; } @@ -752,7 +748,6 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) } xf86ProcessCommonOptions(pInfo, pInfo->options); - pInfo->flags |= XI86_CONFIGURED; if (pInfo->fd != -1) { if (priv->comm.buffer) { |