From be83094bd98c353b0ee7894eefcb1ae91e0cae30 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 23 May 2011 10:18:22 +1000 Subject: syndaemon: don't compare against a null-property. (#37459) synaptics_property is not set, touchpad_off_prop is the property we need to check against. False check for (nprops != 0) instead of (nprops < 0) would result in syndaemon always reporting a touchpad device, even if none are present. X.Org Bug 37459 Signed-off-by: Peter Hutterer --- tools/syndaemon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/syndaemon.c b/tools/syndaemon.c index 020bbde..a8a0499 100644 --- a/tools/syndaemon.c +++ b/tools/syndaemon.c @@ -465,7 +465,6 @@ dp_get_device(Display *dpy) XDeviceInfo *info = NULL; int ndevices = 0; Atom touchpad_type = 0; - Atom synaptics_property = 0; Atom *properties = NULL; int nprops = 0; int error = 0; @@ -495,10 +494,10 @@ dp_get_device(Display *dpy) while(nprops--) { - if (properties[nprops] == synaptics_property) + if (properties[nprops] == touchpad_off_prop) break; } - if (!nprops) + if (nprops < 0) { fprintf(stderr, "No synaptics properties on device '%s'.\n", info[ndevices].name); -- cgit v1.2.3