From 4ea9a28eeec43a22378fe3202fc0e821c5425217 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 22 Apr 2014 14:27:38 -0400
Subject: [PATCH] cursor-renderer: Remove the MetaScreen

It's unused.
---
 src/backends/meta-cursor-renderer.c | 13 ++-----------
 src/backends/meta-cursor-renderer.h |  2 +-
 src/backends/meta-cursor-tracker.c  |  4 ++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c
index d5aa09d48..83af9746a 100644
--- a/src/backends/meta-cursor-renderer.c
+++ b/src/backends/meta-cursor-renderer.c
@@ -38,8 +38,6 @@
 
 struct _MetaCursorRendererPrivate
 {
-  MetaScreen *screen;
-
   gboolean has_hw_cursor;
 
   int current_x, current_y;
@@ -313,16 +311,9 @@ update_pipeline (MetaCursorRenderer *renderer)
 }
 
 MetaCursorRenderer *
-meta_cursor_renderer_new (MetaScreen *screen)
+meta_cursor_renderer_new (void)
 {
-  MetaCursorRenderer *renderer;
-  MetaCursorRendererPrivate *priv;
-
-  renderer = META_CURSOR_RENDERER (g_object_new (META_TYPE_CURSOR_RENDERER, NULL));
-  priv = meta_cursor_renderer_get_instance_private (renderer);
-  priv->screen = screen;
-
-  return renderer;
+  return g_object_new (META_TYPE_CURSOR_RENDERER, NULL);
 }
 
 void
diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h
index 82e24fbe1..218c2cd88 100644
--- a/src/backends/meta-cursor-renderer.h
+++ b/src/backends/meta-cursor-renderer.h
@@ -54,7 +54,7 @@ struct _MetaCursorRendererClass
 
 GType meta_cursor_renderer_get_type (void) G_GNUC_CONST;
 
-MetaCursorRenderer * meta_cursor_renderer_new (MetaScreen *screen);
+MetaCursorRenderer * meta_cursor_renderer_new (void);
 
 void meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer,
                                       MetaCursorReference *cursor);
diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c
index d3486211b..9e0edf79b 100644
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -139,7 +139,7 @@ make_wayland_cursor_tracker (MetaScreen *screen)
 
   self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
   self->screen = screen;
-  self->renderer = meta_cursor_renderer_new (screen);
+  self->renderer = meta_cursor_renderer_new ();
 
   compositor = meta_wayland_compositor_get_default ();
   compositor->seat->pointer.cursor_tracker = self;
@@ -154,7 +154,7 @@ make_x11_cursor_tracker (MetaScreen *screen)
   MetaCursorTracker *self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
 
   self->screen = screen;
-  self->renderer = meta_cursor_renderer_new (screen);
+  self->renderer = meta_cursor_renderer_new ();
 
   XFixesSelectCursorInput (screen->display->xdisplay,
                            screen->xroot,