Commit 1e11b556 authored by Jonas Ådahl's avatar Jonas Ådahl

wayland: Use xdg shell protocol from wayland-protocols

Drop our own copy of the xdg shell XML file, and use the one installed
by wayland-protocols.

https://bugzilla.gnome.org/show_bug.cgi?id=758634
parent 912e79db
......@@ -22,8 +22,8 @@ noinst_LTLIBRARIES = \
BUILT_SOURCES = \
pointer-gestures-unstable-v1-client-protocol.h \
pointer-gestures-unstable-v1-protocol.c \
xdg-shell-client-protocol.h \
xdg-shell-protocol.c \
xdg-shell-unstable-v5-client-protocol.h \
xdg-shell-unstable-v5-protocol.c \
gtk-shell-client-protocol.h \
gtk-shell-protocol.c
......@@ -88,7 +88,6 @@ endef
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
EXTRA_DIST += \
protocol/xdg-shell.xml \
protocol/gtk-shell.xml
-include $(top_srcdir)/git.mk
......@@ -28,7 +28,7 @@
#include <wayland-cursor.h>
#include <wayland-egl.h>
#include <gdk/wayland/gtk-shell-client-protocol.h>
#include <gdk/wayland/xdg-shell-client-protocol.h>
#include <gdk/wayland/xdg-shell-unstable-v5-client-protocol.h>
#include <glib.h>
#include <gdk/gdkkeys.h>
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment