diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-24 21:18:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-11 15:23:01 +1000 |
| commit | edf28df08b557ea6b7edb6c721670745c9e59cb6 (patch) | |
| tree | 76b17d3d2402409abd24a59d4ba2b400258c590c | |
| parent | 01ff37c1a0a1bf74c8efb0ad2ee7b1c1792f98df (diff) | |
| download | xf86-input-wacom-edf28df08b557ea6b7edb6c721670745c9e59cb6.tar.gz | |
Protect against input ABI 9 and the input attributes.
XINPUT_ABI 9 introduced InputAttributes to NIDR. Attributes are assigned by
the config backend (or the configuration). Hence, by the time they hit the
driver they've been converted into options already. From the driver's POV,
duplicating the options is enough, especially since the driver cannot know
which attributes apply to the device anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmValidateDevice.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index 8a47659..e8f4c2b 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -324,7 +324,11 @@ static void wcmHotplug(LocalDevicePtr local, const char *type) input_options = wcmOptionDupConvert(local, type); - NewInputDeviceRequest(input_options, &dev); + NewInputDeviceRequest(input_options, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 9 + NULL, +#endif + &dev); wcmFreeInputOpts(input_options); } |