diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-18 11:38:28 +0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2015-11-26 16:54:32 +0800 |
| commit | 912e79dbe290d6864acaf85174da9a5b6eec30e1 (patch) | |
| tree | 15ffc2581eb749f97b468827e8dd496027f598d3 /gdk/wayland/gdkdisplay-wayland.c | |
| parent | 65b1ee5dd3feacb1aa8a7418002a3d57822f360e (diff) | |
| download | gtk+-912e79dbe290d6864acaf85174da9a5b6eec30e1.tar.gz | |
wayland: Use pointer gestures protocol from wayland-protocols
Instead of having our own copy of the pointer gestures XML file, use
the one installed by wayland-protocols.
Since pointer gestures is an unstable protocol, it went through the
unstable protocol naming convention changes, which is reflected in this
commit.
https://bugzilla.gnome.org/show_bug.cgi?id=758634
Diffstat (limited to 'gdk/wayland/gdkdisplay-wayland.c')
| -rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 64529fb32c..287662b88f 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -35,7 +35,7 @@ #include "gdkkeysprivate.h" #include "gdkprivate-wayland.h" #include "gdkglcontext-wayland.h" -#include "pointer-gestures-client-protocol.h" +#include "pointer-gestures-unstable-v1-client-protocol.h" /** * SECTION:wayland_interaction @@ -358,12 +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 && - version == GDK__WL_POINTER_GESTURES_VERSION) + else if (strcmp (interface, "zwp_pointer_gestures_v1") == 0 && + version == GDK_ZWP_POINTER_GESTURES_V1_VERSION) { display_wayland->pointer_gestures = wl_registry_bind (display_wayland->wl_registry, - id, &_wl_pointer_gestures_interface, version); + id, &zwp_pointer_gestures_v1_interface, version); } else handled = FALSE; |