[PATCH synaptics] tools: skip non-existing properties

Peter Hutterer peter.hutterer at who-t.net
Tue Apr 10 17:21:06 PDT 2012


If a property doesn't exist on a device, skip it.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 tools/synclient.c |    9 +++++++++
 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:
-- 
1.7.7.6


More information about the xorg-devel mailing list