brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Ensure to unlink destroy listeners after destruction

Browse Source 
This is missed in some wl_listeners added
through wl_resource_add_destroy_listener(). Ensure this is done consistently
for all notify functions.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2588>
This commit is contained in:
Carlos Garnacho 2022-08-19 17:08:42 +02:00 committed by Marge Bot
parent 0cfd0c3a8c
commit 51064c1b4e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/meta-wayland-data-device.c
View File

@ -173,11 +173,13 @@ unset_selection_source (MetaWaylandDataDevice *data_device,
} }
static void static void
destroy_drag_focus (struct wl_listener *listener, void *data) destroy_drag_focus (struct wl_listener *listener,
void *data)
{ {
MetaWaylandDragGrab *grab = wl_container_of (listener, grab, drag_focus_listener); MetaWaylandDragGrab *grab = wl_container_of (listener, grab, drag_focus_listener);
grab->drag_focus_data_device = NULL; grab->drag_focus_data_device = NULL;
wl_list_remove (&grab->drag_focus_listener.link);
g_clear_signal_handler (&grab->drag_focus_destroy_handler_id, g_clear_signal_handler (&grab->drag_focus_destroy_handler_id,
grab->drag_focus); grab->drag_focus);
@ -560,12 +562,14 @@ drag_grab_data_source_destroyed (gpointer data, GObject *where_the_object_was)
} }
static void static void
destroy_data_device_icon (struct wl_listener *listener, void *data) destroy_data_device_icon (struct wl_listener *listener,
void *data)
{ {
MetaWaylandDragGrab *drag_grab = MetaWaylandDragGrab *drag_grab =
wl_container_of (listener, drag_grab, drag_icon_listener); wl_container_of (listener, drag_grab, drag_icon_listener);
drag_grab->drag_surface = NULL; drag_grab->drag_surface = NULL;
wl_list_remove (&drag_grab->drag_icon_listener.link);
if (drag_grab->feedback_actor) if (drag_grab->feedback_actor)
clutter_actor_remove_all_children (drag_grab->feedback_actor); clutter_actor_remove_all_children (drag_grab->feedback_actor);