[metacity] screen: move meta_compositor_unmanage call to display

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

commit 34622e3119c23809ce868f0efca6b6cb5d55c3d4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 4 00:05:13 2017 +0200

    screen: move meta_compositor_unmanage call to display
    
    And destroy compositor after unmanaging it.

 src/core/display.c |    5 +++--
 src/core/screen.c  |    5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 22b3b47..3865dad 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -834,6 +834,9 @@ 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)
     {
       meta_screen_free (display->screen, timestamp);
@@ -865,8 +868,6 @@ meta_display_close (MetaDisplay *display,
 
   meta_display_shutdown_keys (display);
 
-  g_clear_object (&display->compositor);
-
   g_free (display);
   the_display = NULL;
 
diff --git a/src/core/screen.c b/src/core/screen.c
index 5564bd7..2bf00db 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -627,15 +627,10 @@ void
 meta_screen_free (MetaScreen *screen,
                   guint32     timestamp)
 {
-  MetaDisplay *display;
   XGCValues gc_values = { 0 };
 
-  display = screen->display;
-
   screen->closing += 1;
 
-  meta_compositor_unmanage (display->compositor);
-
   meta_prefs_remove_listener (prefs_changed_callback, screen);
 
   meta_screen_ungrab_keys (screen);