diff options
| author | Brian Ashworth <[email protected]> | 2018-05-14 09:06:23 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-14 09:06:23 -0400 |
| commit | 9ba0dca7bacb0e79aeac4ea8c605713c69446d9b (patch) | |
| tree | 3573981aaa61ac5c86be6ce1e8ecf5e2112b8d5b /sway/server.c | |
| parent | 77b42ec8216ec785e3981617c5afbb16c1cd31d7 (diff) | |
| parent | 1837756dbed222a6233366f186693e1aeefc2439 (diff) | |
Merge branch 'master' into fix-1975
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); |