Hello community,

here is the log from the commit of package sddm for openSUSE:Factory checked in 
at 2018-08-03 12:30:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sddm (Old)
 and      /work/SRC/openSUSE:Factory/.sddm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sddm"

Fri Aug  3 12:30:36 2018 rev:40 rq:626756 version:0.18.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/sddm/sddm.changes        2018-07-27 
12:02:19.836709364 +0200
+++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes   2018-08-03 
12:30:37.334977332 +0200
@@ -1,0 +2,7 @@
+Tue Jul 31 14:53:47 UTC 2018 - [email protected]
+
+- Add patch to not switch to "undead" sessions (boo#1102832):
+  * 0001-Session-reuse-Only-consider-online-sessions.patch
+- Reenable ReuseSession=true again
+
+-------------------------------------------------------------------

New:
----
  0001-Session-reuse-Only-consider-online-sessions.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sddm.spec ++++++
--- /var/tmp/diff_new_pack.EvGKBU/_old  2018-08-03 12:30:37.978978279 +0200
+++ /var/tmp/diff_new_pack.EvGKBU/_new  2018-08-03 12:30:37.986978291 +0200
@@ -28,6 +28,8 @@
 Source2:        00-general.conf
 Source3:        10-theme.conf
 # Patch0-100: PATCH-FIX-UPSTREAM
+# Merged: https://github.com/sddm/sddm/pull/1062
+Patch0:         0001-Session-reuse-Only-consider-online-sessions.patch
 # Not merged yet: https://github.com/sddm/sddm/pull/997
 Patch50:        0001-Remove-suffix-for-Wayland-session.patch
 # Not merged yet: https://github.com/sddm/sddm/pull/1017

++++++ 00-general.conf ++++++
--- /var/tmp/diff_new_pack.EvGKBU/_old  2018-08-03 12:30:38.022978344 +0200
+++ /var/tmp/diff_new_pack.EvGKBU/_new  2018-08-03 12:30:38.022978344 +0200
@@ -7,6 +7,5 @@
 EnableHiDPI=true
 
 [Users]
-# Deactivated due to boo#1102832 (result of kde#391253)
-## boo#979775
-# ReuseSession=true
+# boo#979775
+ReuseSession=true

++++++ 0001-Session-reuse-Only-consider-online-sessions.patch ++++++
>From f131270ff3ae6e6b4e2dc965cd05b46e194b48c1 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Tue, 31 Jul 2018 16:51:13 +0200
Subject: [PATCH] Session reuse: Only consider "online" sessions

Otherwise it might switch to already dead sessions ("closing" or "lingering").
---
 src/daemon/Display.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
index 86e597e..ec442b0 100644
--- a/src/daemon/Display.cpp
+++ b/src/daemon/Display.cpp
@@ -290,8 +290,8 @@ namespace SDDM {
             foreach(const SessionInfo &s, reply.value()) {
                 if (s.userName == user) {
                     OrgFreedesktopLogin1SessionInterface 
session(Logind::serviceName(), s.sessionPath.path(), 
QDBusConnection::systemBus());
-                    if (session.service() == QLatin1String("sddm")) {
-                        m_reuseSessionId =  s.sessionId;
+                    if (session.service() == QLatin1String("sddm") && 
session.state() == QLatin1String("online")) {
+                        m_reuseSessionId = s.sessionId;
                         break;
                     }
                 }
-- 
2.18.0


Reply via email to