[mutter/wip/carlosg/input-in-backends: 2/16] Drop xinput2 version checks

[Carlos Garnacho <carlosg src gnome org>]

commit 7dcde9efe1dc893377eb72b6b5473feacba72a53
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Mar 26 14:49:47 2019 +0100

    Drop xinput2 version checks
    
    We always request XInput >= 2.3 and fail otherwise, we don't need to
    check for lower versions for touch events.

 clutter/clutter/x11/clutter-backend-x11.c        |  3 ---
 clutter/clutter/x11/clutter-backend-x11.h        |  1 -
 clutter/clutter/x11/clutter-device-manager-xi2.c | 10 +++-------
 3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
index d5ba14826..a7dedb2b2 100644
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -255,8 +255,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
                               "backend", backend_x11,
                               "opcode", event_base,
                               NULL);
-
-              backend_x11->xi_minor = minor;
             }
         }
     }
@@ -264,7 +262,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
   if (backend_x11->device_manager == NULL)
     {
       g_critical ("XI2 extension is missing.");
-      backend_x11->xi_minor = -1;
     }
 
   backend = CLUTTER_BACKEND (backend_x11);
diff --git a/clutter/clutter/x11/clutter-backend-x11.h b/clutter/clutter/x11/clutter-backend-x11.h
index e54af5e1f..36f159178 100644
--- a/clutter/clutter/x11/clutter-backend-x11.h
+++ b/clutter/clutter/x11/clutter-backend-x11.h
@@ -101,7 +101,6 @@ struct _ClutterBackendX11
   Time last_event_time;
 
   ClutterDeviceManager *device_manager;
-  int xi_minor;
 
   XSettingsClient *xsettings;
   Window xsettings_xwin;
diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c 
b/clutter/clutter/x11/clutter-device-manager-xi2.c
index 87da4b050..249d24841 100644
--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
@@ -1130,13 +1130,9 @@ clutter_device_manager_xi2_select_stage_events (ClutterDeviceManager *manager,
   XISetMask (mask, XI_Enter);
   XISetMask (mask, XI_Leave);
 
-  /* enable touch event support if we're running on XInput 2.2 */
-  if (backend_x11->xi_minor >= 2)
-    {
-      XISetMask (mask, XI_TouchBegin);
-      XISetMask (mask, XI_TouchUpdate);
-      XISetMask (mask, XI_TouchEnd);
-    }
+  XISetMask (mask, XI_TouchBegin);
+  XISetMask (mask, XI_TouchUpdate);
+  XISetMask (mask, XI_TouchEnd);
 
   xi_event_mask.deviceid = XIAllMasterDevices;
   xi_event_mask.mask = mask;