From d7ae1917afaf0f5dd6d2f6c3b49b4a5edac2066c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20B=C3=BCchi?= Date: Fri, 20 Dec 2024 13:59:06 +0100 Subject: [PATCH] envmanager: disable session restore for mobile session restore could lead to soft lock since dialer can open on top of the login screen. --- envmanager/config.h | 4 ++++ envmanager/settings.cpp | 6 ++++++ envmanager/settings.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/envmanager/config.h b/envmanager/config.h index 16bde2e6..0d410173 100644 --- a/envmanager/config.h +++ b/envmanager/config.h @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2023 Devin Lin +// SPDX-FileCopyrightText: 2024 Luis Büchi // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -70,3 +71,6 @@ QMap> getKwinrcSettings(KSharedConfig::Ptr m_mo // Make sure that the effect/script is added to the kwinrc "Plugins" section above! const QList KWIN_EFFECTS = {"blur", "mobiletaskswitcher", "screenedge"}; const QList KWIN_SCRIPTS = {"convergentwindows"}; + +//ksmserver +const QMap> KSMSERVER_SETTINGS = {{"General", {{"loginMode", "emptySession"}}}}; diff --git a/envmanager/settings.cpp b/envmanager/settings.cpp index b9e22a32..136617e8 100644 --- a/envmanager/settings.cpp +++ b/envmanager/settings.cpp @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2023 Devin Lin +// SPDX-FileCopyrightText: 2024 Luis Büchi // SPDX-License-Identifier: GPL-2.0-or-later #include "settings.h" @@ -24,6 +25,7 @@ Settings::Settings(QObject *parent) , m_kwinrcConfig{KSharedConfig::openConfig(u"kwinrc"_s, KConfig::SimpleConfig)} , m_appBlacklistConfig{KSharedConfig::openConfig(u"applications-blacklistrc"_s, KConfig::SimpleConfig)} , m_kdeglobalsConfig{KSharedConfig::openConfig(u"kdeglobals"_s, KConfig::SimpleConfig)} + , m_ksmServerConfig{KSharedConfig::openConfig(u"ksmserverrc"_s, KConfig::SimpleConfig)} , m_configWatcher{KConfigWatcher::create(m_mobileConfig)} { } @@ -87,6 +89,10 @@ void Settings::applyMobileConfiguration() writeKeys(u"kdeglobals"_s, m_kdeglobalsConfig, KDEGLOBALS_SETTINGS, false); m_kdeglobalsConfig->sync(); + // ksmserver + writeKeys(u"ksmserverrc"_s, m_ksmServerConfig, KSMSERVER_SETTINGS, false); + m_ksmServerConfig->sync(); + // save our changes m_mobileConfig->sync(); } diff --git a/envmanager/settings.h b/envmanager/settings.h index 1f062dee..d8d9814a 100644 --- a/envmanager/settings.h +++ b/envmanager/settings.h @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2023 Devin Lin +// SPDX-FileCopyrightText: 2024 Luis Büchi // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -41,6 +42,7 @@ private: KSharedConfig::Ptr m_kwinrcConfig; KSharedConfig::Ptr m_appBlacklistConfig; KSharedConfig::Ptr m_kdeglobalsConfig; + KSharedConfig::Ptr m_ksmServerConfig; KConfigWatcher::Ptr m_configWatcher; };