From c957b145a4127678b65490dfb9a41df61c6f4cf4 Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Fri, 6 Nov 2015 16:51:34 +0530 Subject: [PATCH] [wayland] Adapt to changes in the kscreenlocker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Initialize is no longer called by KSldApp ctor, and also pass KWayland::Server::Display* to KSldApp. Reviewed-By: Martin Gräßlin --- wayland_server.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wayland_server.cpp b/wayland_server.cpp index 798ce4d2f8..aeb819ca42 100644 --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -210,7 +210,10 @@ void WaylandServer::initWorkspace() } ); } + ScreenLocker::KSldApp::self(); + ScreenLocker::KSldApp::self()->setWaylandDisplay(m_display); + ScreenLocker::KSldApp::self()->initialize(); if (m_initFlags.testFlag(InitalizationFlag::LockScreen)) { ScreenLocker::KSldApp::self()->lock(ScreenLocker::EstablishLock::Immediate); }