diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2013-06-27 20:17:02 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-07-03 14:52:06 -0400 |
| commit | a85118c1b85df6fbf8f896dca971a5b79a94da71 (patch) | |
| tree | 30390d8883a0e823d62a1c7dc9872b33b7e8e111 /src/data-device.c | |
| parent | d27cb096adf71139734b434d60cbb28bd4a510b1 (diff) | |
| download | weston-a85118c1b85df6fbf8f896dca971a5b79a94da71.tar.gz | |
Use wl_resource_create() for creating resources
This commit sets the version numbers for all added/created objects. The
wl_compositor.create_surface implementation was altered to create a surface
with the same version as the underlying wl_compositor. Since no other
"child interfaces" have version greater than 1, they were all hard-coded to
version 1.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/data-device.c')
| -rw-r--r-- | src/data-device.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/data-device.c b/src/data-device.c index 56278844..205fe792 100644 --- a/src/data-device.c +++ b/src/data-device.c @@ -117,10 +117,11 @@ wl_data_source_send_offer(struct wl_data_source *source, if (offer == NULL) return NULL; - offer->resource = wl_client_new_object(wl_resource_get_client(target), - &wl_data_offer_interface, - &data_offer_interface, offer); - wl_resource_set_destructor(offer->resource, destroy_data_offer); + offer->resource = + wl_resource_create(wl_resource_get_client(target), + &wl_data_offer_interface, 1, 0); + wl_resource_set_implementation(offer->resource, &data_offer_interface, + offer, destroy_data_offer); offer->source = source; offer->source_destroy_listener.notify = destroy_offer_data_source; @@ -545,11 +546,10 @@ create_data_source(struct wl_client *client, wl_array_init(&source->mime_types); - source->resource = wl_client_add_object(client, - &wl_data_source_interface, - &data_source_interface, - id, source); - wl_resource_set_destructor(source->resource, destroy_data_source); + source->resource = + wl_resource_create(client, &wl_data_source_interface, 1, id); + wl_resource_set_implementation(source->resource, &data_source_interface, + source, destroy_data_source); } static void unbind_data_device(struct wl_resource *resource) @@ -565,12 +565,12 @@ get_data_device(struct wl_client *client, 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, - &data_device_interface, id, - seat); + resource = wl_resource_create(client, + &wl_data_device_interface, 1, id); wl_list_insert(&seat->drag_resource_list, wl_resource_get_link(resource)); - wl_resource_set_destructor(resource, unbind_data_device); + wl_resource_set_implementation(resource, &data_device_interface, + seat, unbind_data_device); } static const struct wl_data_device_manager_interface manager_interface = { @@ -582,8 +582,14 @@ static void bind_manager(struct wl_client *client, void *data, uint32_t version, uint32_t id) { - wl_client_add_object(client, &wl_data_device_manager_interface, - &manager_interface, id, NULL); + struct wl_resource *resource; + + resource = + wl_resource_create(client, + &wl_data_device_manager_interface, 1, id); + if (resource) + wl_resource_set_implementation(resource, &manager_interface, + NULL, NULL); } WL_EXPORT void |