Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 485193eb authored by Kai Uwe Broulik's avatar Kai Uwe Broulik 🍇

[Logout Greeter] Remove KDM cruft

KDisplayManager::bootOptions only worked with "NewKDM" but KDM is obsolete in Plasma 5.
Creating an instance of KDisplayManager does DBus stuff to find out the DM being used.
Also, kdmrc is dead and this code always returned None anyway.

Differential Revision: https://phabricator.kde.org/D13998
parent e1b9f53d
......@@ -64,8 +64,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/Xatom.h>
#include <fixx11h.h>
#include <kdisplaymanager.h>
#include <config-workspace.h>
#include <KWayland/Client/surface.h>
......@@ -124,18 +122,12 @@ KSMShutdownDlg::KSMShutdownDlg( QWindow* parent,
context->setContextProperty(QStringLiteral("spdMethods"), mapSpdMethods);
context->setContextProperty(QStringLiteral("canLogout"), KAuthorized::authorize(QStringLiteral("logout")));
QString bootManager = KConfig(QStringLiteral(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig)
.group("Shutdown")
.readEntry("BootManager", "None");
context->setContextProperty(QStringLiteral("bootManager"), bootManager);
// TODO KF6 remove, used to read "BootManager" from kdmrc
context->setContextProperty(QStringLiteral("bootManager"), QStringLiteral("None"));
QStringList options;
int def, cur;
if ( KDisplayManager().bootOptions( rebootOptions, def, cur ) ) {
if ( cur > -1 ) {
def = cur;
}
}
// TODO KF6 remove, used to call KDisplayManager::bootOptions
QStringList rebootOptions;
int def = 0;
QQmlPropertyMap *rebootOptionsMap = new QQmlPropertyMap(this);
rebootOptionsMap->insert(QStringLiteral("options"), QVariant::fromValue(rebootOptions));
rebootOptionsMap->insert(QStringLiteral("default"), QVariant::fromValue(def));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment