[metacity] compositor: remove screen parameter from manage/unmanage

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

commit 893dcb8e650e5acae956d934db32a10588361953
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Mar 1 20:44:18 2017 +0200

    compositor: remove screen parameter from manage/unmanage

 src/compositor/meta-compositor-none.c    |   10 ++++------
 src/compositor/meta-compositor-private.h |    6 ++----
 src/compositor/meta-compositor-xrender.c |   16 ++++++++--------
 src/compositor/meta-compositor.c         |   10 ++++------
 src/core/display.c                       |    4 ++--
 src/core/screen.c                        |    2 +-
 src/include/meta-compositor.h            |    6 ++----
 7 files changed, 23 insertions(+), 31 deletions(-)
---
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index f63e236..388edfd 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -34,14 +34,12 @@ meta_compositor_none_initable_init (MetaCompositor  *compositor,
 }
 
 static void
-meta_compositor_none_manage_screen (MetaCompositor *compositor,
-                                    MetaScreen     *screen)
+meta_compositor_none_manage (MetaCompositor *compositor)
 {
 }
 
 static void
-meta_compositor_none_unmanage_screen (MetaCompositor *compositor,
-                                      MetaScreen     *screen)
+meta_compositor_none_unmanage (MetaCompositor *compositor)
 {
 }
 
@@ -143,8 +141,8 @@ meta_compositor_none_class_init (MetaCompositorNoneClass *none_class)
   compositor_class = META_COMPOSITOR_CLASS (none_class);
 
   compositor_class->initable_init = meta_compositor_none_initable_init;
-  compositor_class->manage_screen = meta_compositor_none_manage_screen;
-  compositor_class->unmanage_screen = meta_compositor_none_unmanage_screen;
+  compositor_class->manage = meta_compositor_none_manage;
+  compositor_class->unmanage = meta_compositor_none_unmanage;
   compositor_class->add_window = meta_compositor_none_add_window;
   compositor_class->remove_window = meta_compositor_none_remove_window;
   compositor_class->set_updates = meta_compositor_none_set_updates;
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index c70725e..5997aba 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -30,11 +30,9 @@ struct _MetaCompositorClass
   gboolean          (* initable_init)      (MetaCompositor     *compositor,
                                             GError            **error);
 
-  void              (* manage_screen)      (MetaCompositor     *compositor,
-                                            MetaScreen         *screen);
+  void              (* manage)             (MetaCompositor     *compositor);
 
-  void              (* unmanage_screen)    (MetaCompositor     *compositor,
-                                            MetaScreen         *screen);
+  void              (* unmanage)           (MetaCompositor     *compositor);
 
   void              (* add_window)         (MetaCompositor     *compositor,
                                             MetaWindow         *window,
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 28cb75a..2e3df82 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -3083,12 +3083,12 @@ meta_compositor_xrender_initable_init (MetaCompositor  *compositor,
 }
 
 static void
-meta_compositor_xrender_manage_screen (MetaCompositor *compositor,
-                                       MetaScreen     *screen)
+meta_compositor_xrender_manage (MetaCompositor *compositor)
 {
   MetaCompScreen *info;
   MetaCompositorXRender *xrender = META_COMPOSITOR_XRENDER (compositor);
-  MetaDisplay *display = meta_screen_get_display (screen);
+  MetaDisplay *display = meta_compositor_get_display (compositor);
+  MetaScreen *screen = meta_display_get_screen (display);
   Display *xdisplay = meta_display_get_xdisplay (display);
   XRenderPictureAttributes pa;
   XRenderPictFormat *visual_format;
@@ -3168,10 +3168,10 @@ meta_compositor_xrender_manage_screen (MetaCompositor *compositor,
 }
 
 static void
-meta_compositor_xrender_unmanage_screen (MetaCompositor *compositor,
-                                         MetaScreen     *screen)
+meta_compositor_xrender_unmanage (MetaCompositor *compositor)
 {
-  MetaDisplay *display = meta_screen_get_display (screen);
+  MetaDisplay *display = meta_compositor_get_display (compositor);
+  MetaScreen *screen = meta_display_get_screen (display);
   Display *xdisplay = meta_display_get_xdisplay (display);
   MetaCompScreen *info;
   Window xroot = meta_screen_get_xroot (screen);
@@ -3723,8 +3723,8 @@ meta_compositor_xrender_class_init (MetaCompositorXRenderClass *xrender_class)
   compositor_class = META_COMPOSITOR_CLASS (xrender_class);
 
   compositor_class->initable_init = meta_compositor_xrender_initable_init;
-  compositor_class->manage_screen = meta_compositor_xrender_manage_screen;
-  compositor_class->unmanage_screen = meta_compositor_xrender_unmanage_screen;
+  compositor_class->manage = meta_compositor_xrender_manage;
+  compositor_class->unmanage = meta_compositor_xrender_unmanage;
   compositor_class->add_window = meta_compositor_xrender_add_window;
   compositor_class->remove_window = meta_compositor_xrender_remove_window;
   compositor_class->set_updates = meta_compositor_xrender_set_updates;
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index c1fd6fe..1734759 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -184,25 +184,23 @@ meta_compositor_new (MetaCompositorType  type,
 }
 
 void
-meta_compositor_manage_screen (MetaCompositor *compositor,
-                               MetaScreen     *screen)
+meta_compositor_manage (MetaCompositor *compositor)
 {
   MetaCompositorClass *compositor_class;
 
   compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
 
-  compositor_class->manage_screen (compositor, screen);
+  compositor_class->manage (compositor);
 }
 
 void
-meta_compositor_unmanage_screen (MetaCompositor *compositor,
-                                 MetaScreen     *screen)
+meta_compositor_unmanage (MetaCompositor *compositor)
 {
   MetaCompositorClass *compositor_class;
 
   compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
 
-  compositor_class->unmanage_screen (compositor, screen);
+  compositor_class->unmanage (compositor);
 }
 
 void
diff --git a/src/core/display.c b/src/core/display.c
index f0817b3..a29ccee 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -252,7 +252,7 @@ update_compositor (MetaDisplay *display,
 
   if (display->compositor != NULL)
     {
-      meta_compositor_unmanage_screen (display->compositor, display->screen);
+      meta_compositor_unmanage (display->compositor);
       g_object_unref (display->compositor);
     }
 
@@ -263,7 +263,7 @@ update_compositor (MetaDisplay *display,
 
   display->compositor = meta_compositor_new (type, display);
 
-  meta_compositor_manage_screen (display->compositor, display->screen);
+  meta_compositor_manage (display->compositor);
 
   if (composite_windows)
     meta_screen_composite_all_windows (display->screen);
diff --git a/src/core/screen.c b/src/core/screen.c
index 5d93c89..a321af4 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -637,7 +637,7 @@ meta_screen_free (MetaScreen *screen,
 
   meta_display_grab (display);
 
-  meta_compositor_unmanage_screen (display->compositor, screen);
+  meta_compositor_unmanage (display->compositor);
 
   meta_display_unmanage_windows_for_screen (display, screen, timestamp);
 
diff --git a/src/include/meta-compositor.h b/src/include/meta-compositor.h
index 842f150..1d59398 100644
--- a/src/include/meta-compositor.h
+++ b/src/include/meta-compositor.h
@@ -40,11 +40,9 @@ typedef enum
 MetaCompositor  *meta_compositor_new                (MetaCompositorType  type,
                                                      MetaDisplay        *display);
 
-void             meta_compositor_manage_screen      (MetaCompositor     *compositor,
-                                                     MetaScreen         *screen);
+void             meta_compositor_manage             (MetaCompositor     *compositor);
 
-void             meta_compositor_unmanage_screen    (MetaCompositor     *compositor,
-                                                     MetaScreen         *screen);
+void             meta_compositor_unmanage           (MetaCompositor     *compositor);
 
 void             meta_compositor_add_window         (MetaCompositor     *compositor,
                                                      MetaWindow         *window,