swc

commit 7c3bc4876f0ae2c806be07614c8cca60af4e628f
parent e549412ed0d6b22e7e1d14de080a11bfb9bc540d
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 20 Jan 2014 00:14:48 -0800

compositor: Move add_globals to initialize

Diffstat:
M
libswc/compositor.c
 | 
10
+++-------
M
libswc/compositor.h
 | 
3
---
M
libswc/swc.c
 | 
2
--

3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/libswc/compositor.c b/libswc/compositor.c
@@ -817,6 +817,9 @@ bool swc_compositor_initialize(struct swc_compositor * compositor,
     struct swc_screen_internal * screen;
     uint32_t keysym;
 
+    wl_global_create(swc.display, &wl_compositor_interface, 3, compositor,
+                     &bind_compositor);
+
     compositor->display = display;
     compositor->scheduled_updates = 0;
     compositor->pending_flips = 0;
@@ -851,13 +854,6 @@ void swc_compositor_finish(struct swc_compositor * compositor)
 {
 }
 
-void swc_compositor_add_globals(struct swc_compositor * compositor,
-                                struct wl_display * display)
-{
-    wl_global_create(display, &wl_compositor_interface, 3, compositor,
-                     &bind_compositor);
-}
-
 void swc_compositor_schedule_update(struct swc_compositor * compositor,
                                     struct swc_screen_internal * screen)
 {
diff --git a/libswc/compositor.h b/libswc/compositor.h
@@ -36,9 +36,6 @@ bool swc_compositor_initialize(struct swc_compositor * compositor,
 
 void swc_compositor_finish(struct swc_compositor * compositor);
 
-void swc_compositor_add_globals(struct swc_compositor * compositor,
-                                struct wl_display * display);
-
 void swc_compositor_schedule_update(struct swc_compositor * compositor,
                                     struct swc_screen_internal * screen);
 
diff --git a/libswc/swc.c b/libswc/swc.c
@@ -122,8 +122,6 @@ bool swc_initialize(struct wl_display * display,
         goto error4;
     }
 
-    swc_compositor_add_globals(&compositor, display);
-
     if (!swc_data_device_manager_initialize())
     {
         ERROR("Could not initialize data device manager\n");