File 0003-Leave-duplicate-symlinks-out-of-the-Sessio... of Package sddm

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch of Package sddm (Revision 069ff39ca7a4554a505de5d125f34c59)

Currently displaying revision 069ff39ca7a4554a505de5d125f34c59 , Show latest

From 793feb3a90f9ff97ebfcc5f77bc6168b32cd5810 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 15 May 2017 11:33:46 +0200
Subject: [PATCH] Leave duplicate symlinks out of the SessionModel

Used for autologin, default.desktop with update-alternatives.

"explicit" needed to be removed from the constructor due to GCC bug 58255
---
 src/common/Session.h         | 2 +-
 src/greeter/SessionModel.cpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/common/Session.h b/src/common/Session.h
index c8c527e..743b7a6 100644
--- a/src/common/Session.h
+++ b/src/common/Session.h
@@ -35,7 +35,7 @@ namespace SDDM {
             WaylandSession
         };
 
-        explicit Session();
+        Session();
         Session(Type type, const QString &fileName);
 
         bool isValid() const;
diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
index 27e8c40..bd5bbf0 100644
--- a/src/greeter/SessionModel.cpp
+++ b/src/greeter/SessionModel.cpp
@@ -122,6 +122,12 @@ namespace SDDM {
             if (!dir.exists(session))
                 continue;
 
+             // Skip symlinks that point to the same directory,
+             // they will be visited under the real name
+             QFileInfo fi_link(dir, session);
+             if (fi_link.isSymLink() && dir.canonicalPath() == fi_link.canonicalPath())
+                 continue;
+
             Session *si = new Session(type, session);
             bool execAllowed = true;
             QFileInfo fi(si->tryExec());
@@ -149,8 +155,9 @@ namespace SDDM {
                 delete si;
         }
         // find out index of the last session
+        QString canonicalLastSession = QFileInfo(stateConfig.Last.Session.get()).canonicalFilePath();
         for (int i = 0; i < d->sessions.size(); ++i) {
-            if (d->sessions.at(i)->fileName() == stateConfig.Last.Session.get()) {
+            if (d->sessions.at(i)->fileName() == canonicalLastSession) {
                 d->lastIndex = i;
                 break;
             }
-- 
2.12.2

Places

File 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch of Package sddm (Revision 069ff39ca7a4554a505de5d125f34c59)

Places