summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2014-07-22 01:36:31 +0200
committerCarlos Garnacho <carlosg@gnome.org>2014-07-22 18:01:29 +0200
commita02b8441b13c1831562f1a143297d3d024e65ae1 (patch)
treeca2fec8879b4c10b4802a42c184bd90ec85e69a5
parentdfe1c106f238abbab5a33e0511f7ed303e1a1cc3 (diff)
downloadmutter-a02b8441b13c1831562f1a143297d3d024e65ae1.tar.gz
wayland: set the interface vfuncs when declaring the touch interface
Otherwise the NULL vtable would be accessed when trying to release the touch device. https://bugzilla.gnome.org/show_bug.cgi?id=733563
-rw-r--r--src/wayland/meta-wayland-touch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wayland/meta-wayland-touch.c b/src/wayland/meta-wayland-touch.c
index a91ee2443..492218631 100644
--- a/src/wayland/meta-wayland-touch.c
+++ b/src/wayland/meta-wayland-touch.c
@@ -543,6 +543,6 @@ meta_wayland_touch_create_new_resource (MetaWaylandTouch *touch,
cr = wl_resource_create (client, &wl_touch_interface,
MIN (META_WL_TOUCH_VERSION, wl_resource_get_version (seat_resource)), id);
- wl_resource_set_implementation (cr, NULL, touch, unbind_resource);
+ wl_resource_set_implementation (cr, &touch_interface, touch, unbind_resource);
wl_list_insert (&touch->resource_list, wl_resource_get_link (cr));
}