summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-01-23 17:09:59 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2013-01-27 15:44:56 -0500
commitb58a1d66816c19eda079a1bd7cecd1ad03644e69 (patch)
treee3dd4cb7515832ab4e103701794f96857c27ce9a
parentdca41f1d36e4ff26767101cd0d150b4d966cb59d (diff)
downloadclutter-b58a1d66816c19eda079a1bd7cecd1ad03644e69.tar.gz
x11: Always request XI2.2
The X server should fill in the minor version that it supports in the case where it only supports the older version. We should not get a BadRequest or fail the version check if we pass something higher. https://bugzilla.gnome.org/show_bug.cgi?id=692466
-rw-r--r--clutter/x11/clutter-backend-x11.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index 2d8f4ba60..26f95810a 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
{
#ifdef HAVE_XINPUT_2
int major = 2;
-
-#ifdef HAVE_XINPUT_2_2
int minor = 2;
-#else
- int minor = 0;
-#endif /* HAVE_XINPUT_2_2 */
if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
{