Drop wl_display_set_compositor() special case

This commit is contained in:
Kristian Høgsberg 2010-09-03 15:15:33 -04:00
parent 9d69f8e796
commit f8ffded1e5
2 changed files with 7 additions and 16 deletions

View file

@ -1376,7 +1376,13 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display)
ec->wl_display = display;
wl_display_set_compositor(display, &ec->base, &compositor_interface);
ec->base.base.interface = &wl_compositor_interface;
ec->base.base.implementation =
(void (**)(void)) &compositor_interface;
wl_display_add_object(display, &ec->base.base);
if (wl_display_add_global(display, &ec->base.base, NULL))
return -1;
ec->shell.base.interface = &wl_shell_interface;
ec->shell.base.implementation = (void (**)(void)) &shell_interface;