commit a0d2dde6cd31e60595b9cf5b8901a5b3e0fee0ab
author Jason Ekstrand <jason@jlekstrand.net> Fri Jun 14 10:08:01 2013 -0500
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jun 14 16:51:20 2013 -0400
tree 816efa1419a973976439a748aa2fb331095cfa92
parent 44a3863a1770379eb5e53c442d6205c55b049546

output: Use wl_resource_get accessors for weston_output resources

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>

src/data-device.c

diff --git a/src/data-device.c b/src/data-device.c
index 1735620..37f6996 100644
--- a/src/data-device.c
+++ b/src/data-device.c
@@ -366,8 +366,8 @@
 		       struct wl_resource *origin_resource,
 		       struct wl_resource *icon_resource, uint32_t serial)
 {
-	struct weston_seat *seat = resource->data;
-	struct weston_drag *drag = resource->data;
+	struct weston_seat *seat = wl_resource_get_user_data(resource);
+	struct weston_drag *drag = wl_resource_get_user_data(resource);
 	struct weston_surface *icon = NULL;
 
 	if (seat->pointer->button_count == 0 ||
@@ -573,7 +573,7 @@
 		struct wl_resource *manager_resource,
 		uint32_t id, struct wl_resource *seat_resource)
 {
-	struct weston_seat *seat = seat_resource->data;
+	struct weston_seat *seat = wl_resource_get_user_data(seat_resource);
 	struct wl_resource *resource;
 
 	resource = wl_client_add_object(client, &wl_data_device_interface,