From e340049eb83b869fa14985dd3922464afaf4b4ad Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 23 Jan 2013 17:07:57 -0500 Subject: [PATCH] gdkdevicemanager-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, so we can safely always pass a higher version number than is potentially supported by the server. libXi was designed to be stable in the case where it doesn't recognize requests or events/replies, so this should still work in a case where we have new versions of the X server, and GTK+, but an old version of libXi, at least for however well that setup should work. https://bugzilla.gnome.org/show_bug.cgi?id=692467 --- gdk/x11/gdkdevicemanager-x11.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c index a34ff664c..d06456cb8 100644 --- a/gdk/x11/gdkdevicemanager-x11.c +++ b/gdk/x11/gdkdevicemanager-x11.c @@ -48,11 +48,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display) int major, minor; major = 2; -#ifdef XINPUT_2_2 minor = 2; -#else - minor = 0; -#endif /* XINPUT_2_2 */ if (!_gdk_disable_multidevice && XIQueryVersion (xdisplay, &major, &minor) != BadRequest) -- 2.43.2