diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 688e01e48..8782749dc 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -66,6 +66,7 @@ target_link_libraries(kdeinit_ksmserver PW::KWorkspace KF5::XmlGui KF5::GlobalAccel + KF5::I18n KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} @@ -75,8 +76,9 @@ target_link_libraries(kdeinit_ksmserver Qt5::Quick KF5::Declarative KF5::DBusAddons + KF5::Notifications KF5::Package - KF5::KDELibs4Support # Solid/PowerManagement + KF5::WindowSystem ${PHONON_LIBRARIES} Qt5::Concurrent ) diff --git a/ksmserver/logout.cpp b/ksmserver/logout.cpp index 7fb316c36..e4306aa25 100644 --- a/ksmserver/logout.cpp +++ b/ksmserver/logout.cpp @@ -76,8 +76,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "global.h" #include "client.h" -#include - #include "logoutprompt_interface.h" #include "shutdown_interface.h" @@ -184,10 +182,6 @@ void KSMServer::performLogout() } state = Shutdown; - // If the logout was confirmed, let's start a powermanagement inhibition. - // We store the cookie so we can interrupt it if the logout will be canceled - inhibitCookie = Solid::PowerManagement::beginSuppressingSleep(QStringLiteral("Shutting down system")); - // shall we save the session on logout? KConfigGroup cg(KSharedConfig::openConfig(), "General"); saveSession = ( cg.readEntry( "loginMode", @@ -393,7 +387,6 @@ void KSMServer::cancelShutdown( KSMClient* c ) clientsToSave.clear(); emit subSessionCloseCanceled(); } else { - Solid::PowerManagement::stopSuppressingSleep(inhibitCookie); qCDebug(KSMSERVER) << "Client " << c->program() << " (" << c->clientId() << ") canceled shutdown."; KNotification::event( QStringLiteral( "cancellogout" ), i18n( "Logout canceled by '%1'", c->program()), diff --git a/ksmserver/server.h b/ksmserver/server.h index a5cc0051c..b97fc3e77 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -245,10 +245,6 @@ private: WindowMap legacyWindows; - - int inhibitCookie; - - //subSession stuff QList clientsToKill; QList clientsToSave;