From 5281425a53aedaf3b03f2d658325e5d1413d36cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Sat, 3 May 2014 17:42:46 +0200
Subject: [PATCH] DeviceManagerXi2: Update cached core pointer in getter if
 NULL

XIGetClientPointer() may return the device id '0' when called early.
This patch makes pointer cursors work in nested mutter Wayland
sessions again.

https://bugzilla.gnome.org/show_bug.cgi?id=729462
---
 clutter/x11/clutter-device-manager-xi2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 375b69d9f..769463bf4 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -1395,6 +1395,9 @@ clutter_device_manager_xi2_get_core_device (ClutterDeviceManager   *manager,
   switch (device_type)
     {
     case CLUTTER_POINTER_DEVICE:
+      if (manager_xi2->client_pointer == NULL)
+        update_client_pointer (manager_xi2);
+
       return manager_xi2->client_pointer;
 
     case CLUTTER_KEYBOARD_DEVICE: