aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2021-04-11 19:14:05 +0200
committerLibravatar Kenny Levinsen <kl@kl.wtf>2021-06-24 18:10:01 +0200
commit62e3ca671da063ec470101b2960d705c897ca8d9 (patch)
tree9e4a4d47cd166b560fd94f49a144c049a12dec08
parentbuild: stop checking for logind (diff)
downloadsway-62e3ca671da063ec470101b2960d705c897ca8d9.tar.gz
sway-62e3ca671da063ec470101b2960d705c897ca8d9.tar.zst
sway-62e3ca671da063ec470101b2960d705c897ca8d9.zip
Remove WLR_HAS_XDG_FOREIGN checks
References: https://github.com/swaywm/wlroots/pull/2833 (cherry picked from commit 1a72049c04b8c6e1a30f80b3887fc7808a717935)
-rw-r--r--sway/server.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sway/server.c b/sway/server.c
index 278afd19..418f3370 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -26,11 +26,9 @@
26#include <wlr/types/wlr_viewporter.h> 26#include <wlr/types/wlr_viewporter.h>
27#include <wlr/types/wlr_xcursor_manager.h> 27#include <wlr/types/wlr_xcursor_manager.h>
28#include <wlr/types/wlr_xdg_decoration_v1.h> 28#include <wlr/types/wlr_xdg_decoration_v1.h>
29#if WLR_HAS_XDG_FOREIGN
30#include <wlr/types/wlr_xdg_foreign_registry.h> 29#include <wlr/types/wlr_xdg_foreign_registry.h>
31#include <wlr/types/wlr_xdg_foreign_v1.h> 30#include <wlr/types/wlr_xdg_foreign_v1.h>
32#include <wlr/types/wlr_xdg_foreign_v2.h> 31#include <wlr/types/wlr_xdg_foreign_v2.h>
33#endif
34#include <wlr/types/wlr_xdg_output_v1.h> 32#include <wlr/types/wlr_xdg_output_v1.h>
35#include "config.h" 33#include "config.h"
36#include "list.h" 34#include "list.h"
@@ -156,12 +154,10 @@ bool server_init(struct sway_server *server) {
156 wlr_primary_selection_v1_device_manager_create(server->wl_display); 154 wlr_primary_selection_v1_device_manager_create(server->wl_display);
157 wlr_viewporter_create(server->wl_display); 155 wlr_viewporter_create(server->wl_display);
158 156
159#if WLR_HAS_XDG_FOREIGN
160 struct wlr_xdg_foreign_registry *foreign_registry = 157 struct wlr_xdg_foreign_registry *foreign_registry =
161 wlr_xdg_foreign_registry_create(server->wl_display); 158 wlr_xdg_foreign_registry_create(server->wl_display);
162 wlr_xdg_foreign_v1_create(server->wl_display, foreign_registry); 159 wlr_xdg_foreign_v1_create(server->wl_display, foreign_registry);
163 wlr_xdg_foreign_v2_create(server->wl_display, foreign_registry); 160 wlr_xdg_foreign_v2_create(server->wl_display, foreign_registry);
164#endif
165 161
166 // Avoid using "wayland-0" as display socket 162 // Avoid using "wayland-0" as display socket
167 char name_candidate[16]; 163 char name_candidate[16];