[mutter] weston-launch: Go through the MetaBackend to force-update the cursor

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

commit 33f3ca7fba57cb2cfe6805934fce5e9a7d029417
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Apr 22 15:56:34 2014 -0400

    weston-launch: Go through the MetaBackend to force-update the cursor

 src/backends/meta-cursor-tracker-private.h |    2 --
 src/backends/meta-cursor-tracker.c         |    8 --------
 src/backends/native/meta-weston-launch.c   |    6 ++++--
 3 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/backends/meta-cursor-tracker-private.h b/src/backends/meta-cursor-tracker-private.h
index 1819be3..dd6c364 100644
--- a/src/backends/meta-cursor-tracker-private.h
+++ b/src/backends/meta-cursor-tracker-private.h
@@ -83,6 +83,4 @@ void     meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
                                              int                new_x,
                                              int                new_y);
 
-void     meta_cursor_tracker_force_update (MetaCursorTracker *tracker);
-
 #endif
diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c
index 2a1b1bd..128ae1c 100644
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -480,11 +480,3 @@ meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
                           tracker->screen->xroot);
     }
 }
-
-void
-meta_cursor_tracker_force_update (MetaCursorTracker *tracker)
-{
-  g_assert (meta_is_wayland_compositor ());
-
-  meta_cursor_renderer_force_update (tracker->renderer);
-}
diff --git a/src/backends/native/meta-weston-launch.c b/src/backends/native/meta-weston-launch.c
index 49c967c..049edb3 100644
--- a/src/backends/native/meta-weston-launch.c
+++ b/src/backends/native/meta-weston-launch.c
@@ -43,7 +43,7 @@
 #include <xf86drmMode.h>
 
 #include "wayland/meta-wayland-private.h"
-#include "meta-cursor-tracker-private.h"
+#include "backends/meta-backend.h"
 #include "meta-weston-launch.h"
 
 struct _MetaLauncher
@@ -216,13 +216,15 @@ meta_launcher_enter (MetaLauncher *launcher)
 
   {
     MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
+    MetaBackend *backend = meta_get_backend ();
+    MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (backend);
 
     /* When we mode-switch back, we need to immediately queue a redraw
      * in case nothing else queued one for us, and force the cursor to
      * update. */
 
     clutter_actor_queue_redraw (compositor->stage);
-    meta_cursor_tracker_force_update (compositor->seat->pointer.cursor_tracker);
+    meta_cursor_renderer_force_update (renderer);
   }
 }