From 32cd1a744700c365f70410ac4090b113b1921598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 20 Aug 2015 11:38:43 +0800
Subject: [PATCH] wayland: Only bind supported unstable pointer gestures global

As the protocol is still considered unstable (meaning not backward
compatible), we should, as stated in the protocol, only bind the version
advertised is the version we implement.

https://bugzilla.gnome.org/show_bug.cgi?id=753856
---
 gdk/wayland/gdkdisplay-wayland.c | 6 ++++--
 gdk/wayland/gdkdisplay-wayland.h | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 32a0583390..d1c58deac7 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -358,10 +358,12 @@ gdk_registry_handle_global (void               *data,
       display_wayland->subcompositor =
         wl_registry_bind (display_wayland->wl_registry, id, &wl_subcompositor_interface, 1);
     }
-  else if (strcmp (interface, "_wl_pointer_gestures") == 0)
+  else if (strcmp (interface, "_wl_pointer_gestures") == 0 &&
+           version == GDK__WL_POINTER_GESTURES_VERSION)
     {
       display_wayland->pointer_gestures =
-        wl_registry_bind (display_wayland->wl_registry, id, &_wl_pointer_gestures_interface, 1);
+        wl_registry_bind (display_wayland->wl_registry,
+                          id, &_wl_pointer_gestures_interface, version);
     }
   else
     handled = FALSE;
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index b834fd763e..4156bc6288 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -45,6 +45,8 @@ G_BEGIN_DECLS
 #define GDK_WAYLAND_MAX_THEME_SCALE 2
 #define GDK_WAYLAND_THEME_SCALES_COUNT GDK_WAYLAND_MAX_THEME_SCALE
 
+#define GDK__WL_POINTER_GESTURES_VERSION 1
+
 typedef struct _GdkWaylandSelection GdkWaylandSelection;
 
 struct _GdkWaylandDisplay