From 2a897af7dc532a3585401ae317d586a69c1af1d3 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 29 Feb 2024 13:33:12 +0100 Subject: [PATCH] wlr_tablet_v2: fix destroy listener name --- include/wlr/types/wlr_tablet_v2.h | 2 +- types/tablet_v2/wlr_tablet_v2_tablet.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wlr/types/wlr_tablet_v2.h b/include/wlr/types/wlr_tablet_v2.h index 54828244..d3a65949 100644 --- a/include/wlr/types/wlr_tablet_v2.h +++ b/include/wlr/types/wlr_tablet_v2.h @@ -59,7 +59,7 @@ struct wlr_tablet_v2_tablet { struct wlr_input_device *wlr_device; struct wl_list clients; // wlr_tablet_client_v2.tablet_link - struct wl_listener tool_destroy; + struct wl_listener tablet_destroy; struct wlr_tablet_client_v2 *current_client; }; diff --git a/types/tablet_v2/wlr_tablet_v2_tablet.c b/types/tablet_v2/wlr_tablet_v2_tablet.c index 7e2de0b0..c2230b39 100644 --- a/types/tablet_v2/wlr_tablet_v2_tablet.c +++ b/types/tablet_v2/wlr_tablet_v2_tablet.c @@ -33,7 +33,7 @@ static const struct zwp_tablet_v2_interface tablet_impl = { static void handle_wlr_tablet_destroy(struct wl_listener *listener, void *data) { struct wlr_tablet_v2_tablet *tablet = - wl_container_of(listener, tablet, tool_destroy); + wl_container_of(listener, tablet, tablet_destroy); struct wlr_tablet_client_v2 *pos; struct wlr_tablet_client_v2 *tmp; @@ -43,7 +43,7 @@ static void handle_wlr_tablet_destroy(struct wl_listener *listener, void *data) wl_list_remove(&tablet->clients); wl_list_remove(&tablet->link); - wl_list_remove(&tablet->tool_destroy.link); + wl_list_remove(&tablet->tablet_destroy.link); free(tablet); } @@ -67,8 +67,8 @@ struct wlr_tablet_v2_tablet *wlr_tablet_create( wl_list_init(&tablet->clients); - tablet->tool_destroy.notify = handle_wlr_tablet_destroy; - wl_signal_add(&wlr_device->events.destroy, &tablet->tool_destroy); + tablet->tablet_destroy.notify = handle_wlr_tablet_destroy; + wl_signal_add(&wlr_device->events.destroy, &tablet->tablet_destroy); wl_list_insert(&seat->tablets, &tablet->link); // We need to create a tablet client for all clients on the seat