[gtk+] wayland: Use xdg shell protocol from wayland-protocols

[Jonas Ådahl <jadahl src gnome org>]

commit 1e11b556066c4e3129dc851a8664b63b50083f2e
Author: Jonas Ådahl <jadahl gmail com>
Date:   Wed Nov 18 11:46:50 2015 +0800

    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

 gdk/wayland/Makefile.am            |    5 +-
 gdk/wayland/gdkdisplay-wayland.h   |    2 +-
 gdk/wayland/protocol/xdg-shell.xml |  485 ------------------------------------
 3 files changed, 3 insertions(+), 489 deletions(-)
---
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 187bcfb..1c696bf 100644
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -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
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 0fb87ee..36c663b 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -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>