summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-04-11 10:15:07 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-04-11 11:10:06 +1000
commitc745604461541c7b21779c60c9bd09ff1a390df2 (patch)
tree3ba6d5f717fb8218f86a51ff249b7d65c93799a3
parent8e297cb586ab855dc7c018c6f3f2f42c08db0419 (diff)
tools: skip non-existing properties
If a property doesn't exist on a device, skip it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--tools/synclient.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/synclient.c b/tools/synclient.c
index 942312a..aef719f 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -446,6 +446,13 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c
XGetDeviceProperty(dpy, dev, prop, 0, 1000, False, AnyPropertyType,
&type, &format, &nitems, &bytes_after, &data);
+ if (type == None)
+ {
+ fprintf(stderr, "Property for '%s' not available. Skipping.\n",
+ par->name);
+ continue;
+ }
+
switch(par->prop_format)
{
case 8:
@@ -517,6 +524,8 @@ dp_show_settings(Display *dpy, XDevice *dev)
XGetDeviceProperty(dpy, dev, a, 0, len, False,
AnyPropertyType, &type, &format,
&nitems, &bytes_after, &data);
+ if (type == None)
+ continue;
switch(par->prop_format) {
case 8: