diff options
| author | Drew DeVault <[email protected]> | 2018-05-14 08:33:55 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-14 08:33:55 -0400 |
| commit | 1837756dbed222a6233366f186693e1aeefc2439 (patch) | |
| tree | 9793561e72a8d1b1f948080b5e36f98dbfa89619 /sway/server.c | |
| parent | 4e6cb2b4b2cff21ca1ec751986d8a2e138ea1ed5 (diff) | |
| parent | 95a10dd4f35c6ffc14d23fa3a19a784e85a31724 (diff) | |
Merge pull request #1871 from emersion/kill-wl-shell
Kill wl_shell
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 10 |
1 files changed, 2 insertions, 8 deletions
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); |