diff --git a/CMakeLists.txt b/CMakeLists.txt
index a190b38007..98dc45fffe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,10 +67,8 @@ find_package(KF5KDE4Support REQUIRED NO_MODULE)
# HACK: remove after split
if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
# screensaver and ksmserver dbus interface
- find_package(KSMServerDBusInterface CONFIG REQUIRED)
find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
else()
- set(KSMSERVER_DBUS_INTERFACE ${ksmserver_SOURCE_DIR}/org.kde.KSMServerInterface.xml)
set(SCREENSAVER_DBUS_INTERFACE ${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
endif()
@@ -371,7 +369,6 @@ qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::D
qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor )
qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl )
-qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${KSMSERVER_DBUS_INTERFACE} ksmserver_interface)
qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${SCREENSAVER_DBUS_INTERFACE} screenlocker_interface)
qt5_add_resources( kwin_KDEINIT_SRCS resources.qrc )
diff --git a/main.cpp b/main.cpp
index 327dda4496..fe50176b04 100644
--- a/main.cpp
+++ b/main.cpp
@@ -28,9 +28,6 @@ along with this program. If not, see .
#include "workspace.h"
#include "xcbutils.h"
-// KDE workspace
-#include
-
// KDE
#include
#include
@@ -483,8 +480,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
// enforce xcb plugin, unfortunately command line switch has precedence
setenv("QT_QPA_PLATFORM", "xcb", true);
- org::kde::KSMServerInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
- ksmserver.suspendStartup(QStringLiteral(KWIN_NAME));
KWin::Application a(argc, argv);
a.setApplicationName(QStringLiteral(KWIN_NAME));
@@ -537,7 +532,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
a.start();
- ksmserver.resumeStartup(QStringLiteral(KWIN_NAME));
#warning SessionManager needs porting
#if KWIN_QT5_PORTING
KWin::SessionManager weAreIndeed;