[metacity] compositor: remove meta_compositor_unmanage

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

commit 1bc5bcd0f40998d8e6a84fd7e15db483efc3b93f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 4 00:16:43 2017 +0200

    compositor: remove meta_compositor_unmanage

 src/compositor/meta-compositor.c |   22 ++++++++++++----------
 src/core/display.c               |    6 +-----
 src/include/meta-compositor.h    |    2 --
 3 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index 60c870d..901f9de 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -65,6 +65,17 @@ initable_iface_init (GInitableIface *iface)
 }
 
 static void
+meta_compositor_finalize (GObject *object)
+{
+  MetaCompositor *compositor;
+
+  compositor = META_COMPOSITOR (object);
+
+  META_COMPOSITOR_GET_CLASS (compositor)->unmanage (compositor);
+  G_OBJECT_CLASS (meta_compositor_parent_class)->finalize (object);
+}
+
+static void
 meta_compositor_get_property (GObject    *object,
                               guint       property_id,
                               GValue     *value,
@@ -130,6 +141,7 @@ meta_compositor_class_init (MetaCompositorClass *compositor_class)
 
   object_class = G_OBJECT_CLASS (compositor_class);
 
+  object_class->finalize = meta_compositor_finalize;
   object_class->get_property = meta_compositor_get_property;
   object_class->set_property = meta_compositor_set_property;
 
@@ -194,16 +206,6 @@ meta_compositor_manage (MetaCompositor *compositor)
 }
 
 void
-meta_compositor_unmanage (MetaCompositor *compositor)
-{
-  MetaCompositorClass *compositor_class;
-
-  compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
-
-  compositor_class->unmanage (compositor);
-}
-
-void
 meta_compositor_add_window (MetaCompositor *compositor,
                             MetaWindow     *window,
                             Window          xwindow)
diff --git a/src/core/display.c b/src/core/display.c
index 3865dad..fa89fa7 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -251,10 +251,7 @@ update_compositor (MetaDisplay *display,
   MetaCompositorType type;
 
   if (display->compositor != NULL)
-    {
-      meta_compositor_unmanage (display->compositor);
-      g_object_unref (display->compositor);
-    }
+    g_object_unref (display->compositor);
 
   if (meta_prefs_get_compositing_manager ())
     type = META_COMPOSITOR_TYPE_XRENDER;
@@ -834,7 +831,6 @@ meta_display_close (MetaDisplay *display,
 
   meta_display_unmanage_windows (display, timestamp);
 
-  meta_compositor_unmanage (display->compositor);
   g_clear_object (&display->compositor);
 
   if (display->screen != NULL)
diff --git a/src/include/meta-compositor.h b/src/include/meta-compositor.h
index 0674711..fd8762d 100644
--- a/src/include/meta-compositor.h
+++ b/src/include/meta-compositor.h
@@ -51,8 +51,6 @@ MetaCompositor  *meta_compositor_new                (MetaCompositorType  type,
 
 void             meta_compositor_manage             (MetaCompositor     *compositor);
 
-void             meta_compositor_unmanage           (MetaCompositor     *compositor);
-
 void             meta_compositor_add_window         (MetaCompositor     *compositor,
                                                      MetaWindow         *window,
                                                      Window              xwindow);