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

window : compare version and call appropriate destructor

Browse Source 
[Pekka Paalanen: removed trailing space, split long line.]

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:55:29 +05:30
committed by Pekka Paalanen
parent 3a510d8f52
commit 6ce67ecbce
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+9 -3
View File
@@ -133,6 +133,7 @@ struct display {
int has_rgb565; int has_rgb565;
int seat_version; int seat_version;
int data_device_manager_version;
}; };
struct window_output { struct window_output {
@@ -5148,9 +5149,12 @@ input_destroy(struct input *input)
if (input->selection_offer) if (input->selection_offer)
data_offer_destroy(input->selection_offer); data_offer_destroy(input->selection_offer);
if (input->data_device) if (input->data_device) {
if(input->display->data_device_manager_version >= 2)
wl_data_device_release(input->data_device);
else
wl_data_device_destroy(input->data_device); wl_data_device_destroy(input->data_device);
}
if (input->display->seat_version >= 3) { if (input->display->seat_version >= 3) {
if (input->pointer) if (input->pointer)
wl_pointer_release(input->pointer); wl_pointer_release(input->pointer);
@@ -5234,9 +5238,11 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t id,
d->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1); d->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
wl_shm_add_listener(d->shm, &shm_listener, d); wl_shm_add_listener(d->shm, &shm_listener, d);
} else if (strcmp(interface, "wl_data_device_manager") == 0) { } else if (strcmp(interface, "wl_data_device_manager") == 0) {
d->data_device_manager_version = MIN(version, 2);
d->data_device_manager = d->data_device_manager =
wl_registry_bind(registry, id, wl_registry_bind(registry, id,
&wl_data_device_manager_interface, 1); &wl_data_device_manager_interface,
d->data_device_manager_version);
} else if (strcmp(interface, "xdg_shell") == 0) { } else if (strcmp(interface, "xdg_shell") == 0) {
d->xdg_shell = wl_registry_bind(registry, id, d->xdg_shell = wl_registry_bind(registry, id,
&xdg_shell_interface, 1); &xdg_shell_interface, 1);