isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 08:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Manually detach source/offer on failure paths

Browse Source 
Adapt more paths to manual detaching of source/offer. This is still
done automatically when the grab is finished.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1720>
This commit is contained in:
Carlos Garnacho 2021-02-08 20:22:35 +01:00 committed by Marge Bot
parent 8e01ea1e04
commit 0f9dc84d3b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,6 +501,7 @@ keyboard_drag_grab_key (MetaWaylandKeyboardGrab *grab,
drag_grab = wl_container_of (grab, drag_grab, keyboard_grab); drag_grab = wl_container_of (grab, drag_grab, keyboard_grab);
meta_wayland_data_source_cancel (drag_grab->drag_data_source); meta_wayland_data_source_cancel (drag_grab->drag_data_source);
meta_wayland_data_source_set_current_offer (drag_grab->drag_data_source, NULL);
meta_dnd_actor_drag_finish (META_DND_ACTOR (drag_grab->feedback_actor), FALSE); meta_dnd_actor_drag_finish (META_DND_ACTOR (drag_grab->feedback_actor), FALSE);
drag_grab->feedback_actor = NULL; drag_grab->feedback_actor = NULL;
data_device_end_drag_grab (drag_grab); data_device_end_drag_grab (drag_grab);
@ -547,6 +548,7 @@ destroy_data_device_origin (struct wl_listener *listener, void *data)
drag_grab->drag_origin = NULL; drag_grab->drag_origin = NULL;
meta_wayland_data_device_set_dnd_source (&drag_grab->seat->data_device, NULL); meta_wayland_data_device_set_dnd_source (&drag_grab->seat->data_device, NULL);
unset_selection_source (&drag_grab->seat->data_device, META_SELECTION_DND); unset_selection_source (&drag_grab->seat->data_device, META_SELECTION_DND);
meta_wayland_data_source_set_current_offer (drag_grab->drag_data_source, NULL);
data_device_end_drag_grab (drag_grab); data_device_end_drag_grab (drag_grab);
} }