public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Steve Cossette <farchord@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/kscreenlocker] rawhide: Fix for user switching dropping to kscreenlocker
Date: Wed, 16 Sep 2026 16:21:22 GMT	[thread overview]
Message-ID: <178957568223.1.1302793581100026894.rpms-kscreenlocker-c033a86bd988@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/kscreenlocker
Branch : rawhide
Commit : c033a86bd9882b4258289ef07503040dba8ac4d0
Author : Steve Cossette <farchord@gmail.com>
Date   : 2026-09-16T12:21:12-04:00
Stats  : +25/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/kscreenlocker/c/c033a86bd9882b4258289ef07503040dba8ac4d0?branch=rawhide

Log:
Fix for user switching dropping to kscreenlocker

---
diff --git a/fix-user-switching.patch b/fix-user-switching.patch
new file mode 100644
index 0000000..aef5929
--- /dev/null
+++ b/fix-user-switching.patch
@@ -0,0 +1,18 @@
+diff -ruN a/interface.cpp b/interface.cpp
+--- a/interface.cpp	2026-09-16 12:14:50.639304771 -0400
++++ b/interface.cpp	2026-09-16 12:16:01.465197996 -0400
+@@ -134,12 +134,11 @@
+     if (!KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) {
+         return;
+     }
+-    m_daemon->lock(calledFromDBus() ? EstablishLock::Immediate : EstablishLock::Delayed);
+-
+-    if (calledFromDBus() && m_daemon->lockState() == KSldApp::Locked) {
++    if (calledFromDBus()) {
+         m_lockReplies << message().createReply();
+         setDelayedReply(true);
+     }
++    m_daemon->lock(calledFromDBus() ? EstablishLock::Immediate : EstablishLock::Delayed);
+ }
+ 
+ bool Interface::SetActive(bool state)

diff --git a/kscreenlocker.spec b/kscreenlocker.spec
index f1cabed..af1dc50 100644
--- a/kscreenlocker.spec
+++ b/kscreenlocker.spec
@@ -1,6 +1,6 @@
 Name:    kscreenlocker
 Version: 6.7.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Library and components for secure lock screen architecture
 
 License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
@@ -13,6 +13,9 @@ Source1: https://download.kde.org/%{stable_kf6}/plasma/%{version}/%{name}-%{vers
 Conflicts: plasma-workspace < 5.5
 
 ## upstream patches
+# Rebased https://invent.kde.org/plasma/kscreenlocker/-/merge_requests/372
+# Fix screenlocker showing up when switching users
+Patch0:        fix-user-switching.patch
 
 BuildRequires: cmake(LayerShellQt)
 
@@ -99,6 +102,9 @@ developing applications that use %{name}.
 
 
 %changelog
+* Wed Sep 16 2026 Steve Cossette <farchord@gmail.com> - 6.7.90-2
+- Fix for user switching dropping to kscreenlocker
+
 * Thu Sep 10 2026 Steve Cossette <farchord@gmail.com> - 6.7.90-1
 - 6.7.90
 

                 reply	other threads:[~2026-09-16 16:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178957568223.1.1302793581100026894.rpms-kscreenlocker-c033a86bd988@fedoraproject.org \
    --to=farchord@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox