commit 7c3bc48

Michael Forney  ·  2014-01-20 08:14:48 +0000 UTC
parent e549412 
compositor: Move add_globals to initialize
3 files changed,  +3, -12
M libswc/compositor.c
M libswc/compositor.h
M libswc/swc.c
M libswc/compositor.c
+3, -7 
 1@@ -817,6 +817,9 @@ bool swc_compositor_initialize(struct swc_compositor * compositor,
 2     struct swc_screen_internal * screen;
 3     uint32_t keysym;
 4 
 5+    wl_global_create(swc.display, &wl_compositor_interface, 3, compositor,
 6+                     &bind_compositor);
 7+
 8     compositor->display = display;
 9     compositor->scheduled_updates = 0;
10     compositor->pending_flips = 0;
11@@ -851,13 +854,6 @@ void swc_compositor_finish(struct swc_compositor * compositor)
12 {
13 }
14 
15-void swc_compositor_add_globals(struct swc_compositor * compositor,
16-                                struct wl_display * display)
17-{
18-    wl_global_create(display, &wl_compositor_interface, 3, compositor,
19-                     &bind_compositor);
20-}
21-
22 void swc_compositor_schedule_update(struct swc_compositor * compositor,
23                                     struct swc_screen_internal * screen)
24 {
M libswc/compositor.h
+0, -3 
 1@@ -36,9 +36,6 @@ bool swc_compositor_initialize(struct swc_compositor * compositor,
 2 
 3 void swc_compositor_finish(struct swc_compositor * compositor);
 4 
 5-void swc_compositor_add_globals(struct swc_compositor * compositor,
 6-                                struct wl_display * display);
 7-
 8 void swc_compositor_schedule_update(struct swc_compositor * compositor,
 9                                     struct swc_screen_internal * screen);
10
M libswc/swc.c
+0, -2 
1@@ -122,8 +122,6 @@ bool swc_initialize(struct wl_display * display,
2         goto error4;
3     }
4 
5-    swc_compositor_add_globals(&compositor, display);
6-
7     if (!swc_data_device_manager_initialize())
8     {
9         ERROR("Could not initialize data device manager\n");