summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2012-02-22 19:52:16 +0100
committerBastien Nocera <hadess@hadess.net>2012-02-22 19:52:16 +0100
commit381d3a6bd42fb6236c10c651f807747e5d535927 (patch)
tree96a1986ce9375b0501ebdaf16a6016d25d403db2
parente229c2ef8d37b5ca2870a1355134dddada6d6cc9 (diff)
lib: Don't fail to create WacomDevice for Touch
The touch part of the Bamboo Touch is important for us to handle similarly to the tablet part, so don't fail creating it. The GNOME framework should ignore the touch device in their Wacom handling though.
-rw-r--r--libwacom/libwacom.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
index e25a083..04e8bd1 100644
--- a/libwacom/libwacom.c
+++ b/libwacom/libwacom.c
@@ -66,7 +66,9 @@ get_device_info (const char *path,
goto bail;
}
- if (g_udev_device_get_property_as_boolean (device, "ID_INPUT_TABLET") == FALSE) {
+ /* Touchpads are only for the "Finger" part of Bamboo devices */
+ if (g_udev_device_get_property_as_boolean (device, "ID_INPUT_TABLET") == FALSE &&
+ g_udev_device_get_property_as_boolean (device, "ID_INPUT_TOUCHPAD") == FALSE) {
libwacom_error_set(error, WERROR_INVALID_PATH, "Device '%s' is not a tablet", path);
goto bail;
}