diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c index ac745e6b2..33da44dfe 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 d653f8f7f..ba2844d9e 100644 --- a/clutter/clutter/x11/clutter-backend-x11.h +++ b/clutter/clutter/x11/clutter-backend-x11.h @@ -100,7 +100,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 6d63ed9bd..542845093 100644 --- a/clutter/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/clutter/x11/clutter-device-manager-xi2.c @@ -1131,13 +1131,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;