From f4e6b138fb442085787712d71029f8d16c663a27 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 14 Aug 2017 19:22:28 +0200
Subject: Move wl_shell into wlroots

---
 examples/compositor/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'examples/compositor/main.c')

diff --git a/examples/compositor/main.c b/examples/compositor/main.c
index 16851614..1d3cb237 100644
--- a/examples/compositor/main.c
+++ b/examples/compositor/main.c
@@ -12,6 +12,7 @@
 #include <wlr/render/gles2.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <xkbcommon/xkbcommon.h>
 #include <wlr/util/log.h>
@@ -21,7 +22,7 @@
 struct sample_state {
 	struct wlr_renderer *renderer;
 	struct wl_compositor_state compositor;
-	struct wl_shell_state shell;
+	struct wlr_wl_shell wl_shell;
 	struct wlr_xdg_shell_v6 *xdg_shell;
 };
 
@@ -75,7 +76,7 @@ int main() {
 	state.renderer = wlr_gles2_renderer_init(compositor.backend);
 	wl_display_init_shm(compositor.display);
 	wl_compositor_init(compositor.display, &state.compositor, state.renderer);
-	wl_shell_init(compositor.display, &state.shell);
+	wlr_wl_shell_init(&state.wl_shell, compositor.display);
 	state.xdg_shell = wlr_xdg_shell_v6_init(compositor.display);
 
 	compositor_run(&compositor);
-- 
cgit v1.2.3