Update wayland sha

Change-Id: Icf48c40b4d078b13c4132e52d351a22395d4ca76
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

3 files changed, 4 insertions, 12 deletions

diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp
index 2c5cb9ea2..12180c410 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp
@@ -60,19 +60,11 @@
 
 void QWaylandDataDeviceManager::data_offer(void *data,
                    struct wl_data_device *data_device,
-                   uint32_t id)
+                   struct wl_data_offer *id)
 {
-
     QWaylandDataDeviceManager *handler = static_cast<QWaylandDataDeviceManager *>(data);
-    //this will be hidden with a wl function call in the near future I hope, but I suppose the scanner
-    //doesn't support it yet
-    struct wl_proxy *newId = wl_proxy_create_for_id(reinterpret_cast<struct wl_proxy *>(data_device),
-                                                    id, &wl_data_offer_interface);
-    struct wl_data_offer *data_offer =
-            reinterpret_cast<struct wl_data_offer *>(newId);
-
 
-    new QWaylandDataOffer(handler->display(),data_offer);
+    new QWaylandDataOffer(handler->display(),id);
 }
 
 void QWaylandDataDeviceManager::enter(void *data,
diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h
index 7db3dfc1b..f50037a08 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h
+++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h
@@ -96,7 +96,7 @@ private:
 
     static void data_offer(void *data,
                        struct wl_data_device *wl_data_device,
-                       uint32_t id);
+                       struct wl_data_offer *id);
     static void enter(void *data,
                   struct wl_data_device *wl_data_device,
                   uint32_t time,
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
index e443e7763..4700c3f89 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
@@ -101,7 +101,7 @@ void QWaylandShellSurface::updateTransientParent(QWindow *parent)
         flags |= WL_SHELL_SURFACE_TRANSIENT_INACTIVE;
 
     wl_shell_surface_set_transient(m_shell_surface,
-                                   parent_wayland_window->shellSurface()->m_shell_surface,
+                                   parent_wayland_window->wl_surface(),
                                    transientPos.x(),
                                    transientPos.y(),
                                    flags);