[mutter] wayland: Clump the globals code together



commit 591718dc02e22d9ffcbcbdd324e68df924985164
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Oct 7 20:54:28 2014 -0700

    wayland: Clump the globals code together

 src/wayland/meta-wayland.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index a120c8e..5d2c526 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -283,12 +283,6 @@ meta_wayland_init (void)
   MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
   GSource *wayland_event_source;
 
-  if (!wl_global_create (compositor->wayland_display,
-                        &wl_compositor_interface,
-                        META_WL_COMPOSITOR_VERSION,
-                        compositor, compositor_bind))
-    g_error ("Failed to register the global wl_compositor");
-
   wayland_event_source = wayland_event_source_new (compositor->wayland_display);
 
   /* XXX: Here we are setting the wayland event source to have a
@@ -300,6 +294,12 @@ meta_wayland_init (void)
   g_source_set_priority (wayland_event_source, GDK_PRIORITY_EVENTS + 1);
   g_source_attach (wayland_event_source, NULL);
 
+  if (!wl_global_create (compositor->wayland_display,
+                        &wl_compositor_interface,
+                        META_WL_COMPOSITOR_VERSION,
+                        compositor, compositor_bind))
+    g_error ("Failed to register the global wl_compositor");
+
   wl_display_init_shm (compositor->wayland_display);
 
   meta_wayland_outputs_init (compositor);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]