[mutter/gnome-3-34] wayland: Do not cancel old data source when setting new selection

[Robert Mader <rmader src gnome org>]

commit eb6189d6b65fc16dae656b1ca7f0257107f87b83
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Apr 16 21:10:14 2020 +0200

    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 df3db0caa..a68ab450f 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -1656,7 +1656,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);
@@ -1781,7 +1780,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);