diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2015-05-17 00:50:56 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2015-05-17 00:59:08 +0200 |
| commit | a4aad807d5cc6842043e12897cfac3a516825c0f (patch) | |
| tree | 660969be57a0f1bd9f64c3d6bd263bf81a96ae41 | |
| parent | 24d2114fcf4d10ae770286cd0c9a5d501c5bf386 (diff) | |
| download | clutter-a4aad807d5cc6842043e12897cfac3a516825c0f.tar.gz | |
x11: Fix touchpad detection
Commit 79849ef1d5fff9acd310cd68d59df0c7cf2cb28f had a typo in the
device property format check. This property is formated in 8-bit
items, not 32-bit.
This went unnoticed till now because some touchpads were still being
detected as such due to a second check below:
else if (strstr (name, "touchpad") != NULL)
source = CLUTTER_TOUCHPAD_DEVICE;
https://bugzilla.gnome.org/show_bug.cgi?id=749482
| -rw-r--r-- | clutter/x11/clutter-device-manager-xi2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c index 17c491ef0..1b101c456 100644 --- a/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/x11/clutter-device-manager-xi2.c @@ -242,7 +242,7 @@ is_touchpad_device (ClutterBackendX11 *backend_x11, /* We don't care about the data */ XFree (data); - if (rc != Success || type != XA_INTEGER || format != 32 || nitems != 1) + if (rc != Success || type != XA_INTEGER || format != 8 || nitems != 1) return FALSE; return TRUE; |