diff --git a/libkworkspace/kworkspace.cpp b/libkworkspace/kworkspace.cpp
index 00bb880d3..bfdf0c2be 100644
--- a/libkworkspace/kworkspace.cpp
+++ b/libkworkspace/kworkspace.cpp
@@ -1,169 +1,162 @@
 /* This file is part of the KDE libraries
     Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "kworkspace.h"
 #include "config-libkworkspace.h"
 
 #include <QDataStream>
 #include <QFile>
 #include <QFileInfo>
 #include <QTextStream>
 #include <QDateTime>
 #include <QDBusConnection>
 #include <stdlib.h> // getenv()
 #include <ksmserver_interface.h>
 #include <QSocketNotifier>
 
 #if HAVE_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/SM/SMlib.h>
 #include <fixx11h.h>
 #endif
 
 #if HAVE_X11
 #define DISPLAY "DISPLAY"
 #elif defined(Q_WS_QWS)
 #define DISPLAY "QWS_DISPLAY"
 #endif
 
 #include "config-workspace.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif // HAVE_UNISTD_H
 
 #include <pwd.h>
 #include <sys/types.h>
 
 namespace KWorkSpace
 {
 
 void requestShutDown(ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode)
 {
-    /*  use ksmserver's dcop interface if necessary  */
-    if ( confirm == ShutdownConfirmYes ||
-         sdtype != ShutdownTypeDefault ||
-         sdmode != ShutdownModeDefault )
-    {
-        org::kde::KSMServerInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
-        ksmserver.logout((int)confirm,  (int)sdtype,  (int)sdmode);
-        return;
-    }
+    org::kde::KSMServerInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
+    ksmserver.logout((int)confirm,  (int)sdtype,  (int)sdmode);
 }
 
 bool canShutDown( ShutdownConfirm confirm,
                   ShutdownType sdtype,
                   ShutdownMode sdmode )
 {
 #if HAVE_X11
     if ( confirm == ShutdownConfirmYes ||
          sdtype != ShutdownTypeDefault ||
          sdmode != ShutdownModeDefault )
     {
         org::kde::KSMServerInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
         QDBusReply<bool> reply = ksmserver.canShutdown();
         if (!reply.isValid()) {
             return false;
         }
         return reply;
     }
 
     return true;
 #else
     return false;
 #endif
 }
 
 bool isShuttingDown()
 {
     org::kde::KSMServerInterface ksmserver(QStringLiteral("org.kde.ksmserver"), QStringLiteral("/KSMServer"), QDBusConnection::sessionBus());
     QDBusReply<bool> reply = ksmserver.isShuttingDown();
     if (!reply.isValid()) {
         return false;
     }
     return reply;
 }
 
 static QTime smModificationTime;
 void propagateSessionManager()
 {
 #if HAVE_X11
     QByteArray fName = QFile::encodeName(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation)+"/KSMserver");
     QString display = QString::fromLocal8Bit( ::getenv(DISPLAY) );
     // strip the screen number from the display
     display.remove(QRegExp(QStringLiteral("\\.[0-9]+$")));
     int i;
     while( (i = display.indexOf(':')) >= 0)
        display[i] = '_';
     while( (i = display.indexOf('/')) >= 0)
        display[i] = '_';
 
     fName += '_';
     fName += display.toLocal8Bit();
     QByteArray smEnv = ::getenv("SESSION_MANAGER");
     bool check = smEnv.isEmpty();
     if ( !check && smModificationTime.isValid() ) {
          QFileInfo info( fName );
          QTime current = info.lastModified().time();
          check = current > smModificationTime;
     }
     if ( check ) {
         QFile f( fName );
         if ( !f.open( QIODevice::ReadOnly ) )
             return;
         QFileInfo info ( f );
         smModificationTime = QTime( info.lastModified().time() );
         QTextStream t(&f);
         t.setCodec( "ISO 8859-1" );
         QString s = t.readLine();
         f.close();
         ::setenv( "SESSION_MANAGER", s.toLatin1(), true  );
     }
 #endif
 }
 
 void detectPlatform(int argc, char **argv)
 {
     if (qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
         return;
     }
     for (int i = 0; i < argc; i++) {
         if (qstrcmp(argv[i], "-platform") == 0 ||
                 qstrcmp(argv[i], "--platform") == 0 ||
                 QByteArray(argv[i]).startsWith("-platform=") ||
                 QByteArray(argv[i]).startsWith("--platform=")) {
             return;
         }
     }
     const QByteArray sessionType = qgetenv("XDG_SESSION_TYPE");
     if (sessionType.isEmpty()) {
         return;
     }
     if (qstrcmp(sessionType, "wayland") == 0) {
         qputenv("QT_QPA_PLATFORM", "wayland");
     } else if (qstrcmp(sessionType, "x11") == 0) {
         qputenv("QT_QPA_PLATFORM", "xcb");
     }
 }
 
 } // end namespace