diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-22 12:20:47 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-22 12:22:02 -0800 |
| commit | b832bc7424d7d14a9a43334476e7dd17122f22f0 (patch) | |
| tree | 93fd53020df75ee02796297825950fca1e27dd59 /src/wayland | |
| parent | 89b14babb9babcab5bec8a42aab1aad9f77b4ee2 (diff) | |
| download | mutter-b832bc7424d7d14a9a43334476e7dd17122f22f0.tar.gz | |
wayland: Upgrade to v2 of data-device
To fix a resource leak.
Diffstat (limited to 'src/wayland')
| -rw-r--r-- | src/wayland/meta-wayland-data-device.c | 7 | ||||
| -rw-r--r-- | 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 a726cd279..36675a5d6 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 e6ba794cd..3944956aa 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 |