From 9e7e7bb056a91ec62c40e2cd94454ea006d452c9 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 7 Jul 2018 20:34:44 +0200 Subject: [PATCH 3/3] Don't add a (Wayland) suffix to Wayland sessions It got removed from sddm as well. --- src/sessionmodel.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp index 429d664..99c5d51 100644 --- a/src/sessionmodel.cpp +++ b/src/sessionmodel.cpp @@ -57,6 +57,7 @@ SessionModel::~SessionModel() { void SessionModel::loadDir(const QString &path, SessionType type) { + Q_UNUSED(type); QDir dir(path); dir.setNameFilters(QStringList() << QStringLiteral("*.desktop")); dir.setFilter(QDir::Files); @@ -82,13 +83,8 @@ void SessionModel::loadDir(const QString &path, SessionType type) if (current_section != QLatin1String("Desktop Entry")) continue; // We are only interested in the "Desktop Entry" section - if (line.startsWith(QLatin1String("Name="))) { + if (line.startsWith(QLatin1String("Name="))) si->name = line.mid(5); - if (type == SessionTypeWayland) { - //we want to exactly match the SDDM prompt which is formatted in this way - si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name); - } - } if (line.startsWith(QLatin1String("Exec="))) si->exec = line.mid(5); if (line.startsWith(QLatin1String("Comment="))) -- 2.21.0