diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2013-06-14 10:07:53 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-06-14 15:58:29 -0400 |
| commit | 0f2ef7ebd34163f1f303bf171f99c3e5147893d5 (patch) | |
| tree | 29b1263bd7f129c75224449405ac4535b92f1f85 /src/data-device.c | |
| parent | de4667351c69a1b7838dd6f2c47c2d7befb9f506 (diff) | |
| download | weston-0f2ef7ebd34163f1f303bf171f99c3e5147893d5.tar.gz | |
Use wl_resource_get_user_data for weston_surface resources
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/data-device.c')
| -rw-r--r-- | src/data-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/data-device.c b/src/data-device.c index 06d24f1c..1735620d 100644 --- a/src/data-device.c +++ b/src/data-device.c @@ -372,13 +372,13 @@ data_device_start_drag(struct wl_client *client, struct wl_resource *resource, if (seat->pointer->button_count == 0 || seat->pointer->grab_serial != serial || - seat->pointer->focus != origin_resource->data) + seat->pointer->focus != wl_resource_get_user_data(origin_resource)) return; /* FIXME: Check that the data source type array isn't empty. */ if (icon_resource) - icon = icon_resource->data; + icon = wl_resource_get_user_data(icon_resource); if (icon && icon->configure) { wl_resource_post_error(icon_resource, WL_DISPLAY_ERROR_INVALID_OBJECT, @@ -493,7 +493,7 @@ data_device_set_selection(struct wl_client *client, return; /* FIXME: Store serial and check against incoming serial here. */ - weston_seat_set_selection(resource->data, source_resource->data, + weston_seat_set_selection(resource->data, wl_resource_get_user_data(source_resource), serial); } |