reftests: Add a rendering test for sibling matching

[~andy/gtk] / gdk / x11 / gdkdevicemanager-x11.c

diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index b49230454dfcd00bc4a1bd9a773142dff2acae0f..75470636a9e595efa83a888635597f1650ccc539 100644 (file)
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -54,7 +52,11 @@ _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)
@@ -66,6 +68,8 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
               device_manager_xi2 = g_object_new (GDK_TYPE_X11_DEVICE_MANAGER_XI2,
                                                  "display", display,
                                                  "opcode", opcode,
+                                                 "major", major,
+                                                 "minor", minor,
                                                  NULL);
 
               return GDK_DEVICE_MANAGER (device_manager_xi2);
@@ -100,6 +104,8 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
  *
  * Returns: (transfer none): (allow-none): The #GdkDevice wrapping the device ID,
  *          or %NULL if the given ID doesn't currently represent a device.
+ *
+ * Since: 3.2
  **/
 GdkDevice *
 gdk_x11_device_manager_lookup (GdkDeviceManager *device_manager,
@@ -145,6 +151,8 @@ gdk_x11_device_manager_lookup (GdkDeviceManager *device_manager,
  * </note>
  *
  * Returns: the XInput2 device ID.
+ *
+ * Since: 3.2
  **/
 gint
 gdk_x11_device_get_id (GdkDevice *device)