[mutter] wayland: Upgrade to v2 of data-device
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Upgrade to v2 of data-device
- Date: Sat, 22 Nov 2014 22:38:20 +0000 (UTC)
commit b832bc7424d7d14a9a43334476e7dd17122f22f0
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sat Nov 22 12:20:47 2014 -0800
wayland: Upgrade to v2 of data-device
To fix a resource leak.
src/wayland/meta-wayland-data-device.c | 7 +++++++
src/wayland/meta-wayland-versions.h | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index a726cd2..36675a5 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -547,9 +547,16 @@ data_device_set_selection (struct wl_client *client,
meta_wayland_data_device_set_selection (data_device, source, serial);
}
+static void
+data_device_release(struct wl_client *client, struct wl_resource *resource)
+{
+ wl_resource_destroy(resource);
+}
+
static const struct wl_data_device_interface data_device_interface = {
data_device_start_drag,
data_device_set_selection,
+ data_device_release,
};
static void
diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
index e6ba794..3944956 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -36,7 +36,7 @@
/* Global/master objects (version exported by wl_registry and negotiated through bind) */
#define META_WL_COMPOSITOR_VERSION 3
-#define META_WL_DATA_DEVICE_MANAGER_VERSION 1
+#define META_WL_DATA_DEVICE_MANAGER_VERSION 2
#define META_XDG_SHELL_VERSION 1
#define META_WL_SHELL_VERSION 1
#define META_WL_SEAT_VERSION 4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]