From 56f159ddedcca2c562a4321996a7824f528b2b83 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 30 Sep 2020 16:23:33 +0100
Subject: [PATCH] Adapt to DataSource changes

---
 wayland_server.cpp | 1 -
 xwl/clipboard.cpp  | 4 ++--
 xwl/databridge.cpp | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wayland_server.cpp b/wayland_server.cpp
index 03f1cafde..8fb905165 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -388,7 +388,6 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags
     m_display->createPointerGestures(PointerGesturesInterfaceVersion::UnstableV1, m_display)->create();
     m_display->createPointerConstraints(PointerConstraintsInterfaceVersion::UnstableV1, m_display)->create();
     m_dataDeviceManager = m_display->createDataDeviceManager(m_display);
-    m_dataDeviceManager->create();
     m_display->createDataControlDeviceManagerV1(m_display);
     m_display->createPrimarySelectionDeviceManagerV1(m_display);
     m_idle = m_display->createIdle(m_display);
diff --git a/xwl/clipboard.cpp b/xwl/clipboard.cpp
index 37a5c3b83..ee8306c87 100644
--- a/xwl/clipboard.cpp
+++ b/xwl/clipboard.cpp
@@ -83,7 +83,7 @@ void Clipboard::wlSelectionChanged(KWaylandServer::AbstractDataSource *dsi)
 
 bool Clipboard::ownsSelection(KWaylandServer::AbstractDataSource *dsi) const
 {
-    return dsi->client() == DataBridge::self()->dataDeviceIface()->client()->client();
+    return dsi->client() == DataBridge::self()->dataDeviceIface()->client();
 }
 
 void Clipboard::checkWlSource()
@@ -105,7 +105,7 @@ void Clipboard::checkWlSource()
     // Otherwise the Wayland source gets destroyed to shield
     // against snooping X clients.
 
-    if (!dsi || (DataBridge::self()->dataDeviceIface()->client()->client() == dsi->client())) {
+    if (!dsi || (DataBridge::self()->dataDeviceIface()->client() == dsi->client())) {
         // Xwayland source or no source
         disconnect(m_checkConnection);
         m_checkConnection = QMetaObject::Connection();
diff --git a/xwl/databridge.cpp b/xwl/databridge.cpp
index ee57d065b..71e6f3723 100644
--- a/xwl/databridge.cpp
+++ b/xwl/databridge.cpp
@@ -21,6 +21,7 @@
 #include <KWayland/Client/datadevicemanager.h>
 #include <KWayland/Client/seat.h>
 
+#include <KWaylandServer/clientconnection.h>
 #include <KWaylandServer/datadevicemanager_interface.h>
 #include <KWaylandServer/datadevice_interface.h>
 #include <KWaylandServer/seat_interface.h>
@@ -58,7 +59,7 @@ DataBridge::DataBridge(QObject *parent)
             if (m_dataDeviceInterface) {
                 return;
             }
-            if (dataDeviceInterface->client() != waylandServer()->internalConnection()) {
+            if (dataDeviceInterface->client() != *waylandServer()->internalConnection()) {
                 return;
             }
             QObject::disconnect(*dc);