[mutter/wayland] display: Set the cursor when calling XIGrabDevice again

[Jasper St. Pierre <jstpierre src gnome org>]

commit 82066e02c558a6d95a707b255ba4ffb2a719463d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Dec 5 16:45:29 2013 -0500

    display: Set the cursor when calling XIGrabDevice again

 src/core/display.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 49aea52..8959aa0 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3862,6 +3862,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
 {
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
   XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+  MetaCursor cursor = meta_cursor_for_grab_op (op);
 
   XISetMask (mask.mask, XI_ButtonPress);
   XISetMask (mask.mask, XI_ButtonRelease);
@@ -3876,7 +3877,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
                     META_VIRTUAL_CORE_POINTER_ID,
                     grab_xwindow,
                     timestamp,
-                    None,
+                    meta_display_create_x_cursor (display, cursor),
                     XIGrabModeAsync, XIGrabModeAsync,
                     False, /* owner_events */
                     &mask) == Success)
@@ -3895,7 +3896,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
 
   meta_error_trap_pop (display);
 
-  meta_cursor_tracker_set_grab_cursor (screen->cursor_tracker, meta_cursor_for_grab_op (op));
+  meta_cursor_tracker_set_grab_cursor (screen->cursor_tracker, cursor);
 }
 
 gboolean