fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 21:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

weston-info: destroy wl_keyboard

Browse source 
Fixes a memory leak by calling wl_keyboard_destroy on any keyboard
that was used to listen for events.

Signed-off-by: Markus Ongyerth <wl@ongy.net>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Markus Ongyerth 2018-04-30 11:35:50 +02:00 • committed by Pekka Paalanen
parent ccdc81d609
commit 995bf51b2c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/weston-info.c
View file

@ -118,6 +118,7 @@ struct seat_info {
struct wl_seat *seat;
struct weston_info *info;
struct wl_keyboard *keyboard;
uint32_t capabilities;
char *name;
@ -498,10 +499,8 @@ seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
return;
if (caps & WL_SEAT_CAPABILITY_KEYBOARD) {
struct wl_keyboard *keyboard;
keyboard = wl_seat_get_keyboard(seat->seat);
wl_keyboard_add_listener(keyboard, &keyboard_listener,
seat->keyboard = wl_seat_get_keyboard(seat->seat);
wl_keyboard_add_listener(seat->keyboard, &keyboard_listener,
seat);
seat->info->roundtrip_needed = true;
@ -531,6 +530,9 @@ destroy_seat_info(void *data)
if (seat->name != NULL)
free(seat->name);
if (seat->keyboard)
wl_keyboard_destroy(seat->keyboard);
wl_list_remove(&seat->global_link);
}