[metacity] compositor: remove screen parameter from set_active_window

[Alberts Muktupāvels <muktupavels src gnome org>]

commit bd6c47fa5aee6c09b443dab194a6ed2704337467
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 2 01:38:59 2017 +0200

    compositor: remove screen parameter from set_active_window

 src/compositor/meta-compositor-none.c    |    1 -
 src/compositor/meta-compositor-private.h |    1 -
 src/compositor/meta-compositor-xrender.c |    3 ++-
 src/compositor/meta-compositor.c         |    3 +--
 src/core/window.c                        |    9 +++------
 src/include/meta-compositor.h            |    1 -
 6 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index 15d0af6..be72a46 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -79,7 +79,6 @@ meta_compositor_none_get_window_surface (MetaCompositor *compositor,
 
 static void
 meta_compositor_none_set_active_window (MetaCompositor *compositor,
-                                        MetaScreen     *screen,
                                         MetaWindow     *window)
 {
 }
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index 69727ca..6dcc811 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -53,7 +53,6 @@ struct _MetaCompositorClass
                                             MetaWindow         *window);
 
   void              (* set_active_window)  (MetaCompositor     *compositor,
-                                            MetaScreen         *screen,
                                             MetaWindow         *window);
 
   void              (* begin_move)         (MetaCompositor     *compositor,
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 1cf8a8d..7e2c62c 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -3487,11 +3487,11 @@ meta_compositor_xrender_get_window_surface (MetaCompositor *compositor,
 
 static void
 meta_compositor_xrender_set_active_window (MetaCompositor *compositor,
-                                           MetaScreen     *screen,
                                            MetaWindow     *window)
 {
   MetaCompositorXRender *xrender;
   MetaDisplay *display;
+  MetaScreen *screen;
   Display *xdisplay;
   MetaCompWindow *old_focus = NULL, *new_focus = NULL;
   MetaCompScreen *info = NULL;
@@ -3499,6 +3499,7 @@ meta_compositor_xrender_set_active_window (MetaCompositor *compositor,
 
   xrender = META_COMPOSITOR_XRENDER (compositor);
   display = meta_compositor_get_display (compositor);
+  screen = meta_display_get_screen (display);
   xdisplay = meta_display_get_xdisplay (display);
   info = meta_screen_get_compositor_data (screen);
 
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index 5ec869d..40ded03 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -263,14 +263,13 @@ meta_compositor_get_window_surface (MetaCompositor *compositor,
 
 void
 meta_compositor_set_active_window (MetaCompositor *compositor,
-                                   MetaScreen     *screen,
                                    MetaWindow     *window)
 {
   MetaCompositorClass *compositor_class;
 
   compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
 
-  compositor_class->set_active_window (compositor, screen, window);
+  compositor_class->set_active_window (compositor, window);
 }
 
 void
diff --git a/src/core/window.c b/src/core/window.c
index 9294d80..14a8cd4 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1069,8 +1069,7 @@ meta_window_free (MetaWindow  *window,
   if (window->display->focus_window == window)
     {
       window->display->focus_window = NULL;
-      meta_compositor_set_active_window (window->display->compositor,
-                                         window->screen, NULL);
+      meta_compositor_set_active_window (window->display->compositor, NULL);
     }
 
   if (window->maximized_horizontally || window->maximized_vertically)
@@ -5754,8 +5753,7 @@ meta_window_notify_focus (MetaWindow *window,
                       "* Focus --> %s\n", window->desc);
           window->display->focus_window = window;
           window->has_focus = TRUE;
-          meta_compositor_set_active_window (window->display->compositor,
-                                             window->screen, window);
+          meta_compositor_set_active_window (window->display->compositor, window);
 
           /* Move to the front of the focusing workspace's MRU list.
            * We should only be "removing" it from the MRU list if it's
@@ -5845,8 +5843,7 @@ meta_window_notify_focus (MetaWindow *window,
 
           meta_window_appears_focused_changed (window);
 
-          meta_compositor_set_active_window (window->display->compositor,
-                                             window->screen, NULL);
+          meta_compositor_set_active_window (window->display->compositor, NULL);
 
           meta_error_trap_push (window->display);
           XUninstallColormap (window->display->xdisplay,
diff --git a/src/include/meta-compositor.h b/src/include/meta-compositor.h
index 53b6568..719ee0f 100644
--- a/src/include/meta-compositor.h
+++ b/src/include/meta-compositor.h
@@ -63,7 +63,6 @@ cairo_surface_t *meta_compositor_get_window_surface (MetaCompositor     *composi
                                                      MetaWindow         *window);
 
 void             meta_compositor_set_active_window  (MetaCompositor     *compositor,
-                                                     MetaScreen         *screen,
                                                      MetaWindow         *window);
 
 void             meta_compositor_begin_move         (MetaCompositor     *compositor,