From 9ad61fe02f1bb135ef00d981294c5d86a6502132 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 16 Apr 2020 21:10:14 +0200 Subject: [PATCH] wayland: Do not cancel old data source when setting new selection This is taken care already by the MetaSelection machinery, by deactivating the previous selection source when setting a new one. That works across X11 and internal selection sources. This only works when replacing one wayland source with another, and actually results in doubly .cancelled events due to the other paths. Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1177 https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1203 (cherry picked from commit 0b6560fac41beaf08d89d30b4450dc7318c5a740) --- src/wayland/meta-wayland-data-device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index b20864b9d..28daf11d0 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -1669,7 +1669,6 @@ meta_wayland_data_device_set_selection (MetaWaylandDataDevice *data_device, if (data_device->selection_data_source) { - meta_wayland_data_source_cancel (data_device->selection_data_source); g_object_weak_unref (G_OBJECT (data_device->selection_data_source), selection_data_source_destroyed, data_device); @@ -1794,7 +1793,6 @@ meta_wayland_data_device_set_primary (MetaWaylandDataDevice *data_device, if (data_device->primary_data_source) { - meta_wayland_data_source_cancel (data_device->primary_data_source); g_object_weak_unref (G_OBJECT (data_device->primary_data_source), primary_source_destroyed, data_device);