From 671040d14faaeffbf8d1ce5e5b45e2dc521cd0cf Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Wed, 3 Nov 2010 13:13:51 +0100 Subject: vmmouse: Make the driver work with pre ABI12 servers Signed-off-by: Thomas Hellstrom --- src/vmmouse.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vmmouse.c b/src/vmmouse.c index 9cec4d7..762b2c9 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -341,7 +341,6 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) return NULL; } - pInfo->name = dev->identifier; #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 pInfo->motion_history_proc = xf86GetMotionEvents; @@ -354,18 +353,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->private_flags = 0; pInfo->always_core_feedback = 0; pInfo->conf_idev = dev; + pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; /* Collect the options, and process the common options. */ xf86CollectInputOptions(pInfo, NULL, NULL); xf86ProcessCommonOptions(pInfo, pInfo->options); if (NewVMMousePreInit(drv, pInfo, flags) == Success) - { - pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; - return pInfo; - } + pInfo->flags |= XI86_CONFIGURED; - return NULL; + return pInfo; } static int -- cgit v1.2.3