From 40d3ad3ac00fc21f2561c906d1246648a9f74087 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 20 May 2009 11:42:35 +1000 Subject: Only label axes and buttons if the device has axes or buttons. Signed-off-by: Peter Hutterer (cherry picked from commit 3c43d880f13725a04fcd7c0c8d5978a36208e373) --- src/evdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 9fc0663..fc4832b 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1982,7 +1982,7 @@ EvdevInitProperty(DeviceIntPtr dev) #ifdef HAVE_LABELS /* Axis labelling */ - if ((prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) + if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) { Atom atom, atoms[pEvdev->num_vals]; int natoms = pEvdev->num_vals; @@ -2026,7 +2026,7 @@ EvdevInitProperty(DeviceIntPtr dev) XISetDevicePropertyDeletable(dev, prop_axis_label, FALSE); } /* Button labelling */ - if ((prop_btn_label = XIGetKnownProperty(BTN_LABEL_PROP))) + if ((pEvdev->buttons > 0) && (prop_btn_label = XIGetKnownProperty(BTN_LABEL_PROP))) { Atom atom, atoms[pEvdev->buttons]; int button, bmap; -- cgit v1.2.3