diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2020-04-16 21:10:14 +0200 |
|---|---|---|
| committer | Robert Mader <robert.mader@posteo.de> | 2020-04-19 21:59:43 +0200 |
| commit | eb6189d6b65fc16dae656b1ca7f0257107f87b83 (patch) | |
| tree | 2be89a91d24801f5a53ec23f182207e898453989 | |
| parent | 668d13ffb56ca60801dc3f74b0115b7689bddd64 (diff) | |
| download | mutter-eb6189d6b65fc16dae656b1ca7f0257107f87b83.tar.gz | |
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)
| -rw-r--r-- | src/wayland/meta-wayland-data-device.c | 2 |
1 files changed, 0 insertions, 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); |