Fabian Vogt
04f2fc03a4
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcm_sddm?expand=0&rev=264
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From bb0c90b0a7c9f0a1a76b3f71fa802ae2050a87b2 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
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, 1 insertion(+), 7 deletions(-)
|
|
|
|
diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
|
|
index 50e22d4..e756a9b 100644
|
|
--- a/src/sessionmodel.cpp
|
|
+++ b/src/sessionmodel.cpp
|
|
@@ -61,6 +61,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);
|
|
@@ -91,13 +92,6 @@ void SessionModel::loadDir(const QString &path, SessionType type)
|
|
|
|
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
|
|
- // with the exact same check
|
|
- if (!si->name.endsWith(QLatin1String(" (Wayland)"))) {
|
|
- si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name);
|
|
- }
|
|
- }
|
|
}
|
|
if (line.startsWith(QLatin1String("Exec="))) {
|
|
si->exec = line.mid(5);
|
|
--
|
|
2.25.1
|
|
|