From 95a10dd4f35c6ffc14d23fa3a19a784e85a31724 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sun, 29 Apr 2018 09:40:58 +0100
Subject: Kill wl_shell

---
 sway/server.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'sway/server.c')

diff --git a/sway/server.c b/sway/server.c
index 6147a39d..050ddf56 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -8,15 +8,14 @@
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_gamma_control.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
+#include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_linux_dmabuf.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_screenshooter.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_output.h>
-#include <wlr/types/wlr_wl_shell.h>
-#include <wlr/types/wlr_idle.h>
 #include <wlr/util/log.h>
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
@@ -88,11 +87,6 @@ bool server_init(struct sway_server *server) {
 		&server->xdg_shell_surface);
 	server->xdg_shell_surface.notify = handle_xdg_shell_surface;
 
-	server->wl_shell = wlr_wl_shell_create(server->wl_display);
-	wl_signal_add(&server->wl_shell->events.new_surface,
-		&server->wl_shell_surface);
-	server->wl_shell_surface.notify = handle_wl_shell_surface;
-
 	// TODO make xwayland optional
 	server->xwayland =
 		wlr_xwayland_create(server->wl_display, server->compositor, true);
-- 
cgit v1.2.3