From 45c877173577cf450f0932c6899b740cacb4254f Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Tue, 8 Mar 2022 15:54:38 -0500 Subject: [PATCH] types/wlr_virtual_keyboard_v1: remove destroy event The destroy event from the keyboard base wlr_input_device must be used --- include/wlr/types/wlr_virtual_keyboard_v1.h | 4 ---- types/wlr_virtual_keyboard_v1.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/include/wlr/types/wlr_virtual_keyboard_v1.h b/include/wlr/types/wlr_virtual_keyboard_v1.h index a818f141..8350f413 100644 --- a/include/wlr/types/wlr_virtual_keyboard_v1.h +++ b/include/wlr/types/wlr_virtual_keyboard_v1.h @@ -31,10 +31,6 @@ struct wlr_virtual_keyboard_v1 { bool has_keymap; struct wl_list link; - - struct { - struct wl_signal destroy; // struct wlr_virtual_keyboard_v1* - } events; }; struct wlr_virtual_keyboard_manager_v1* wlr_virtual_keyboard_manager_v1_create( diff --git a/types/wlr_virtual_keyboard_v1.c b/types/wlr_virtual_keyboard_v1.c index 5a5ce630..01f7d6dc 100644 --- a/types/wlr_virtual_keyboard_v1.c +++ b/types/wlr_virtual_keyboard_v1.c @@ -109,8 +109,6 @@ static void virtual_keyboard_destroy_resource(struct wl_resource *resource) { return; } - wlr_signal_emit_safe(&keyboard->events.destroy, keyboard); - wlr_keyboard_finish(&keyboard->keyboard); wl_resource_set_user_data(keyboard->resource, NULL); @@ -171,7 +169,6 @@ static void virtual_keyboard_manager_create_virtual_keyboard( virtual_keyboard->resource = keyboard_resource; virtual_keyboard->seat = seat_client->seat; - wl_signal_init(&virtual_keyboard->events.destroy); wl_list_insert(&manager->virtual_keyboards, &virtual_keyboard->link);