AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland-device: Upgrade to v3 of seat

Browse Source 
To prevent memory leaks.
This commit is contained in:
Jasper St. Pierre 2014-07-25 09:41:48 -04:00
parent 407a778bc5
commit 6c35ae199e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/wayland/gdkdevice-wayland.c
View File

@ -1496,7 +1496,7 @@ seat_handle_capabilities (void *data,
} }
else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && device->wl_pointer) else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && device->wl_pointer)
{ {
wl_pointer_destroy (device->wl_pointer); wl_pointer_release (device->wl_pointer);
device->wl_pointer = NULL; device->wl_pointer = NULL;
_gdk_device_set_associated_device (device->pointer, NULL); _gdk_device_set_associated_device (device->pointer, NULL);
@ -1533,7 +1533,7 @@ seat_handle_capabilities (void *data,
} }
else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && device->wl_keyboard) else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && device->wl_keyboard)
{ {
wl_keyboard_destroy (device->wl_keyboard); wl_keyboard_release (device->wl_keyboard);
device->wl_keyboard = NULL; device->wl_keyboard = NULL;
_gdk_device_set_associated_device (device->keyboard, NULL); _gdk_device_set_associated_device (device->keyboard, NULL);
@ -1570,7 +1570,7 @@ seat_handle_capabilities (void *data,
} }
else if (!(caps & WL_SEAT_CAPABILITY_TOUCH) && device->wl_touch) else if (!(caps & WL_SEAT_CAPABILITY_TOUCH) && device->wl_touch)
{ {
wl_touch_destroy (device->wl_touch); wl_touch_release (device->wl_touch);
device->wl_touch = NULL; device->wl_touch = NULL;
_gdk_device_set_associated_device (device->touch, NULL); _gdk_device_set_associated_device (device->touch, NULL);

2
gdk/wayland/gdkdisplay-wayland.c
View File

@ -171,7 +171,7 @@ gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id
wl_registry_bind(display_wayland->wl_registry, id, &wl_output_interface, MIN (version, 2)); wl_registry_bind(display_wayland->wl_registry, id, &wl_output_interface, MIN (version, 2));
_gdk_wayland_screen_add_output(display_wayland->screen, id, output, MIN (version, 2)); _gdk_wayland_screen_add_output(display_wayland->screen, id, output, MIN (version, 2));
} else if (strcmp(interface, "wl_seat") == 0) { } else if (strcmp(interface, "wl_seat") == 0) {
seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 2); seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 3);
_gdk_wayland_device_manager_add_seat (gdk_display->device_manager, id, seat); _gdk_wayland_device_manager_add_seat (gdk_display->device_manager, id, seat);
} else if (strcmp(interface, "wl_data_device_manager") == 0) { } else if (strcmp(interface, "wl_data_device_manager") == 0) {
display_wayland->data_device_manager = display_wayland->data_device_manager =