Discard the selection and drag source when not active anymore

If another client sets a selection or starts a drag the active
wl_data_source, if any, gets a 'cancelled' event. We must listen to
this and discard the wl_data_source, else e.g. checking the clipboard
content will still return the data of the source instead of the current
wl_data_offer.

Change-Id: I80b202baf95fbc8abe19496a991cb30bc0b78bb0
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
index 2d6a6f4b6..f5056f6d0 100644
--- a/src/client/qwaylanddatadevice.cpp
+++ b/src/client/qwaylanddatadevice.cpp
@@ -84,6 +84,8 @@ QWaylandDataSource *QWaylandDataDevice::selectionSource() const
 void QWaylandDataDevice::setSelectionSource(QWaylandDataSource *source)
 {
     m_selectionSource.reset(source);
+    if (source)
+        connect(source, &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::selectionSourceCancelled);
     set_selection(source ? source->object() : 0, 0 /* TODO m_display->serial() */);
 }
 
@@ -95,7 +97,7 @@ QWaylandDataOffer *QWaylandDataDevice::dragOffer() const
 void QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon)
 {
     m_dragSource.reset(new QWaylandDataSource(m_display->dndSelectionHandler(), mimeData));
-
+    connect(m_dragSource.data(), &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::dragSourceCancelled);
     QWaylandWindow *origin = m_display->currentInputDevice()->pointerFocus();
 
     start_drag(m_dragSource->object(), origin->object(), icon->object(), m_display->currentInputDevice()->serial());