mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data_device : change version while initializing data_device_manager interface and data_device interface

Browse Source 
[Pekka Paalanen: split long lines, dropped MIN().]

Signed-off-by: kabeer khan <kabeer.khan@samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
kabeer khan
2014-10-20 11:47:15 +05:30
committed by Pekka Paalanen
parent 280e7dd918
commit 3a510d8f52
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data-device.c
+13 -5
View File
@@ -762,10 +762,16 @@ data_device_set_selection(struct wl_client *client,
wl_resource_get_user_data(source_resource), wl_resource_get_user_data(source_resource),
serial); 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 = { static const struct wl_data_device_interface data_device_interface = {
data_device_start_drag, data_device_start_drag,
data_device_set_selection, data_device_set_selection,
data_device_release
}; };
static void static void
@@ -845,7 +851,9 @@ get_data_device(struct wl_client *client,
struct wl_resource *resource; struct wl_resource *resource;
resource = wl_resource_create(client, resource = wl_resource_create(client,
&wl_data_device_interface, 1, id); &wl_data_device_interface,
wl_resource_get_version(manager_resource),
id);
if (resource == NULL) { if (resource == NULL) {
wl_resource_post_no_memory(manager_resource); wl_resource_post_no_memory(manager_resource);
return; return;
@@ -868,9 +876,9 @@ bind_manager(struct wl_client *client,
{ {
struct wl_resource *resource; struct wl_resource *resource;
resource = resource = wl_resource_create(client,
wl_resource_create(client, &wl_data_device_manager_interface,
&wl_data_device_manager_interface, 1, id); version, id);
if (resource == NULL) { if (resource == NULL) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
@@ -910,7 +918,7 @@ WL_EXPORT int
wl_data_device_manager_init(struct wl_display *display) wl_data_device_manager_init(struct wl_display *display)
{ {
if (wl_global_create(display, if (wl_global_create(display,
&wl_data_device_manager_interface, 1, &wl_data_device_manager_interface, 2,
NULL, bind_manager) == NULL) NULL, bind_manager) == NULL)
return -1; return -1;