[clutter/clutter-1.14] x11: Always request XI2.2



commit b58a1d66816c19eda079a1bd7cecd1ad03644e69
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Jan 23 17:09:59 2013 -0500

    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

 clutter/x11/clutter-backend-x11.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index 2d8f4ba..26f9581 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)
                 {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]