[mutter] data-device: Start a cleanup
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] data-device: Start a cleanup
- Date: Thu, 10 Jul 2014 17:39:07 +0000 (UTC)
commit 581335fbea06ba7fb8812241ead634c269dce91f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Jul 10 10:19:47 2014 -0400
data-device: Start a cleanup
src/wayland/meta-wayland-data-device.c | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index 67f7578..9618d05 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -49,6 +49,12 @@ struct _MetaWaylandDataSource
};
static void
+unbind_resource (struct wl_resource *resource)
+{
+ wl_list_remove (wl_resource_get_link (resource));
+}
+
+static void
data_offer_accept (struct wl_client *client,
struct wl_resource *resource,
guint32 serial,
@@ -484,24 +490,17 @@ create_data_source (struct wl_client *client,
}
static void
-unbind_data_device (struct wl_resource *resource)
-{
- wl_list_remove (wl_resource_get_link (resource));
-}
-
-static void
get_data_device (struct wl_client *client,
struct wl_resource *manager_resource,
guint32 id, struct wl_resource *seat_resource)
{
MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
- struct wl_resource *resource;
+ struct wl_resource *cr;
- resource = wl_resource_create (client, &wl_data_device_interface,
- MIN (META_WL_DATA_DEVICE_VERSION,
- wl_resource_get_version (manager_resource)), id);
- wl_resource_set_implementation (resource, &data_device_interface, seat, unbind_data_device);
- wl_list_insert (&seat->data_device_resource_list, wl_resource_get_link (resource));
+ cr = wl_resource_create (client, &wl_data_device_interface,
+ MIN (META_WL_DATA_DEVICE_VERSION, wl_resource_get_version (manager_resource)),
id);
+ wl_resource_set_implementation (cr, &data_device_interface, seat, unbind_resource);
+ wl_list_insert (&seat->data_device_resource_list, wl_resource_get_link (cr));
}
static const struct wl_data_device_manager_interface manager_interface = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]