[mutter] compositor: Create the MetaWaylandStage here

[Jasper St. Pierre <jstpierre src gnome org>]

commit 168ede93742d488dc8fafb1cd33d7564a6e814e4
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Apr 22 14:35:56 2014 -0400

    compositor: Create the MetaWaylandStage here

 src/compositor/compositor.c |   12 +++++++-----
 src/wayland/meta-wayland.c  |    5 -----
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index acb0599..b4529b1 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -79,6 +79,7 @@
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 
+#include "wayland/meta-wayland-stage.h"
 #include "wayland/meta-wayland-private.h"
 
 static gboolean
@@ -519,16 +520,17 @@ meta_compositor_manage (MetaCompositor *compositor)
   MetaScreen *screen = display->screen;
   Window xwin = 0;
   gint width, height;
-  MetaWaylandCompositor *wayland_compositor;
 
   meta_screen_set_cm_selection (display->screen);
 
-  /* We will have already created a stage if running as a wayland
-   * compositor... */
   if (meta_is_wayland_compositor ())
     {
-      wayland_compositor = meta_wayland_compositor_get_default ();
-      compositor->stage = wayland_compositor->stage;
+      MetaWaylandCompositor *wayland_compositor = meta_wayland_compositor_get_default ();
+
+      compositor->stage = meta_wayland_stage_new ();
+      clutter_actor_show (compositor->stage);
+
+      wayland_compositor->stage = compositor->stage;
 
       meta_screen_get_size (screen, &width, &height);
       clutter_actor_set_size (compositor->stage, width, height);
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 0c4aef7..34be91c 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -41,7 +41,6 @@
 
 #include "meta-wayland-private.h"
 #include "meta-xwayland-private.h"
-#include "meta-wayland-stage.h"
 #include "meta-window-actor-private.h"
 #include "meta-wayland-seat.h"
 #include "meta-wayland-keyboard.h"
@@ -631,16 +630,12 @@ meta_wayland_init (void)
   compositor->outputs = g_hash_table_new_full (NULL, NULL, NULL, wayland_output_destroy_notify);
   compositor->outputs = meta_wayland_compositor_update_outputs (compositor, monitors);
 
-  compositor->stage = meta_wayland_stage_new ();
-
   meta_wayland_data_device_manager_init (compositor->wayland_display);
 
   compositor->seat = meta_wayland_seat_new (compositor->wayland_display);
 
   meta_wayland_init_shell (compositor);
 
-  clutter_actor_show (compositor->stage);
-
   /* FIXME: find the first free name instead */
   compositor->display_name = g_strdup ("wayland-0");
   if (wl_display_add_socket (compositor->wayland_display, compositor->display_name))