[plasma/plasma-login-manager] src: drop unused DisplayServerFailed path

David Edmundson <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit 76b0bccb75b2836b795d6b83303fd23fd68e950f by David Edmundson.
Committed on 20/07/2026 at 12:16.
Pushed by davidedmundson into branch 'master'.

drop unused DisplayServerFailed path

This is a relic from the X11 days when we launched the display server.
The greeter no longer emits it.

M  +0    -1    src/auth/Auth.h
M  +0    -1    src/daemon/Display.cpp
M  +0    -1    src/daemon/Display.h
M  +1    -3    src/daemon/Greeter.cpp
M  +4    -23   src/daemon/Seat.cpp
M  +0    -3    src/daemon/Seat.h

https://invent.kde.org/plasma/plasma-login-manager/-/commit/76b0bccb75b2836b795d6b83303fd23fd68e950f

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 1e97de94..bc95301e 100644
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -67,7 +67,6 @@ public:
         HELPER_AUTH_ERROR,
         HELPER_SESSION_ERROR,
         HELPER_OTHER_ERROR,
-        HELPER_DISPLAYSERVER_ERROR,
         HELPER_TTY_ERROR,
     };
     Q_ENUM(HelperExitStatus)
diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
index e5065ae3..875ceaf1 100644
--- a/src/daemon/Display.cpp
+++ b/src/daemon/Display.cpp
@@ -87,7 +87,6 @@ Display::Display(Seat *parent)
         VirtualTerminal::jumpToVt(PLASMALOGIN_INITIAL_VT, true);
         stop();
     });
-    connect(m_greeter, &Greeter::displayServerFailed, this, &Display::displayServerFailed);
 
     // Per-seat autologin: a seat with its own [Autologin][<seat>] subgroup is logged in as that
     // subgroup's User running its Session, so a dedicated seat can be driven by the login manager
diff --git a/src/daemon/Display.h b/src/daemon/Display.h
index 762b2e64..c267e3db 100644
--- a/src/daemon/Display.h
+++ b/src/daemon/Display.h
@@ -63,7 +63,6 @@ public slots:
 
 signals:
     void stopped();
-    void displayServerFailed();
 
     void loginFailed(QLocalSocket *socket);
     void loginSucceeded(QLocalSocket *socket);
diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
index 8bc8203c..47521cf8 100644
--- a/src/daemon/Greeter.cpp
+++ b/src/daemon/Greeter.cpp
@@ -195,9 +195,7 @@ void Greeter::onHelperFinished(Auth::HelperExitStatus status)
     m_auth->deleteLater();
     m_auth = nullptr;
 
-    if (status == Auth::HELPER_DISPLAYSERVER_ERROR) {
-        Q_EMIT displayServerFailed();
-    } else if (status == Auth::HELPER_TTY_ERROR) {
+    if (status == Auth::HELPER_TTY_ERROR) {
         Q_EMIT ttyFailed();
     } else if (status == Auth::HELPER_SESSION_ERROR) {
         Q_EMIT failed();
diff --git a/src/daemon/Seat.cpp b/src/daemon/Seat.cpp
index 8f5a59be..515a079f 100644
--- a/src/daemon/Seat.cpp
+++ b/src/daemon/Seat.cpp
@@ -147,11 +147,6 @@ void Seat::createDisplay()
 
     // restart display on stop
     connect(display, &Display::stopped, this, &Seat::displayStopped);
-    connect(display, &Display::displayServerFailed, this, [this, display] {
-        removeDisplay(display);
-        qWarning() << "Failed to launch a display server";
-        QCoreApplication::instance()->exit(12);
-    });
 
     // add display to the list
     m_displays << display;
@@ -181,30 +176,16 @@ void Seat::startDisplay(Display *display, int tryNr)
     });
 }
 
-void Seat::removeDisplay(Display *display)
-{
-    qDebug() << "Removing display" << display << "...";
-
-    // remove display from list
-    m_displays.removeAll(display);
-
-    // stop the display
-    display->blockSignals(true);
-    display->stop();
-    display->blockSignals(false);
-
-    // delete display
-    display->deleteLater();
-}
-
 void Seat::displayStopped()
 {
     Display *display = qobject_cast<Display *>(sender());
     std::optional<int> nextVt;
     nextVt = vtForSession(display->reuseSessionId());
 
-    // remove display
-    removeDisplay(display);
+    // remove display from list
+    m_displays.removeAll(display);
+    // delete display
+    display->deleteLater();
 
     // restart otherwise
     if (m_displays.isEmpty()) {
diff --git a/src/daemon/Seat.h b/src/daemon/Seat.h
index 34b52c14..1f562cdd 100644
--- a/src/daemon/Seat.h
+++ b/src/daemon/Seat.h
@@ -42,9 +42,6 @@ public:
     void activateSession(const QString &sessionId) const;
     std::optional<int> vtForSession(const QString &sessionId) const;
 
-public slots:
-    void removeDisplay(PLASMALOGIN::Display *display);
-
 private slots:
     void displayStopped();
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.