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/tree/container.c | 6 ------
 sway/tree/view.c      | 2 --
 2 files changed, 8 deletions(-)

(limited to 'sway/tree')

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 9f7294db..a17b20f7 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -6,7 +6,6 @@
 #include <strings.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "cairo.h"
@@ -446,11 +445,6 @@ struct sway_container *container_at(struct sway_container *parent,
 				_surface = wlr_surface_surface_at(sview->surface,
 					view_sx, view_sy, &_sx, &_sy);
 				break;
-			case SWAY_VIEW_WL_SHELL:
-				_surface = wlr_wl_shell_surface_surface_at(
-					sview->wlr_wl_shell_surface,
-					view_sx, view_sy, &_sx, &_sy);
-				break;
 			case SWAY_VIEW_XDG_SHELL_V6:
 				// the top left corner of the sway container is the
 				// coordinate of the top left corner of the window geometry
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 41dee1c4..e0e3c110 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -97,8 +97,6 @@ uint32_t view_get_window_type(struct sway_view *view) {
 
 const char *view_get_type(struct sway_view *view) {
 	switch(view->type) {
-	case SWAY_VIEW_WL_SHELL:
-		return "wl_shell";
 	case SWAY_VIEW_XDG_SHELL_V6:
 		return "xdg_shell_v6";
 	case SWAY_VIEW_XDG_SHELL:
-- 
cgit v1.2.3