Run Wayland sessions through the wayland-session script

plfiorini · plfiorini · commit 4f1f1f5cf07c · 2015-06-22T21:28:47.000+02:00
Issue: #419
diff --git a/src/common/Session.h b/src/common/Session.h
@@ -77,8 +77,7 @@ namespace SDDM {
     };
 
     inline QDataStream &operator<<(QDataStream &stream, const Session &session) {
-        const quint32 type = static_cast<quint32>(session.type());
-        stream << type << session.fileName();
+        stream << quint32(session.type()) << session.fileName();
         return stream;
     }
 
diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
@@ -41,13 +41,20 @@ namespace SDDM {
     bool UserSession::start() {
         QProcessEnvironment env = qobject_cast<HelperApp*>(parent())->session()->processEnvironment();
 
-        if (env.value("XDG_SESSION_CLASS") == "greeter")
+        if (env.value("XDG_SESSION_CLASS") == QStringLiteral("greeter")) {
             QProcess::start(m_path);
-        else {
+        } else if (env.value("XDG_SESSION_TYPE") == QStringLiteral("x11")) {
             qDebug() << "Starting:" << mainConfig.XDisplay.SessionCommand.get()
                      << m_path;
             QProcess::start(mainConfig.XDisplay.SessionCommand.get(),
                             QStringList() << m_path);
+        } else if (env.value("XDG_SESSION_TYPE") == QStringLiteral("wayland")) {
+            qDebug() << "Starting:" << mainConfig.WaylandDisplay.SessionCommand.get()
+                     << m_path;
+            QProcess::start(mainConfig.WaylandDisplay.SessionCommand.get(),
+                            QStringList() << m_path);
+        } else {
+            qCritical() << "Unable to run user session: unknown session type";
         }
 
         return waitForStarted();

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ namespace SDDM {`
`77`	`77`	`};`
`78`	`78`
`79`	`79`	`inline QDataStream &operator<<(QDataStream &stream, const Session &session) {`
`80`		`- const quint32 type = static_cast<quint32>(session.type());`
`81`		`- stream << type << session.fileName();`
	`80`	`+ stream << quint32(session.type()) << session.fileName();`
`82`	`81`	`return stream;`
`83`	`82`	`}`
`84`	`83`