--- Begin Message ---
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: ayatana-indicator-session@packages.debian.org
Control: affects -1 + src:ayatana-indicator-session
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ayatana-indicator-session
[ Reason ]
In Lomiri, ayatana-indicator-sesssion offers a menu item to lock the
session. The user expectation is that this menu items activates a normal
user session lock screen. However, the session indicator would activate
the displayer manager's greeter instead (which looks like a session
logout). When logging back in from the greeter, the session is resumed.
However, this behaviour is quite counter-intuitive.
With the provided change, the session indicator's "Lock Session" menu
item now simply locks the session. If a switch user action is required,
users can click in the session indicator's list of other user accounts
on the system. This will then get the user back to the display
manager's greeter screen.
[ Impact ]
Usability flaw in Lomiri's system tray.
[ Tests ]
Unit tests at build time, runtime tests on real notebook hardware.
[ Risks ]
Minimal. Only for Lomiri users and users of ayatana-indicator-session on
other desktop envs (not a default setup in Debian).
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
Relevant for Lomiri on Debian.
unblock ayatana-indicator-session/24.5.1-2
diff -Nru ayatana-indicator-session-24.5.1/debian/changelog ayatana-indicator-session-24.5.1/debian/changelog
--- ayatana-indicator-session-24.5.1/debian/changelog 2025-04-01 11:27:35.000000000 +0200
+++ ayatana-indicator-session-24.5.1/debian/changelog 2025-06-21 16:22:33.000000000 +0200
@@ -1,3 +1,11 @@
+ayatana-indicator-session (24.5.1-2) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0001_src-backend-dbus-actions-c-Dont-switch-to-greeter-when-locking-
+ Lomiri.patch. Don't switch to greeter when locking the screen in Lomiri.
+
+ -- Mike Gabriel <sunweaver@debian.org> Sat, 21 Jun 2025 16:22:33 +0200
+
ayatana-indicator-session (24.5.1-1) unstable; urgency=medium
[ Mike Gabriel ]
diff -Nru ayatana-indicator-session-24.5.1/debian/patches/0001_src-backend-dbus-actions-c-Dont-switch-to-greeter-when-locking-Lomiri.patch ayatana-indicator-session-24.5.1/debian/patches/0001_src-backend-dbus-actions-c-Dont-switch-to-greeter-when-locking-Lomiri.patch
--- ayatana-indicator-session-24.5.1/debian/patches/0001_src-backend-dbus-actions-c-Dont-switch-to-greeter-when-locking-Lomiri.patch 1970-01-01 01:00:00.000000000 +0100
+++ ayatana-indicator-session-24.5.1/debian/patches/0001_src-backend-dbus-actions-c-Dont-switch-to-greeter-when-locking-Lomiri.patch 2025-06-21 15:56:53.000000000 +0200
@@ -0,0 +1,56 @@
+From cd1044a376ab772d5bdd1655c135ac39e39dc012 Mon Sep 17 00:00:00 2001
+From: Robert Tari <robert@tari.in>
+Date: Tue, 17 Jun 2025 18:11:44 +0200
+Subject: [PATCH] Don't switch to greeter when locking Lomiri
+
+https://salsa.debian.org/ubports-team/lomiri/-/issues/39
+---
+ src/backend-dbus/actions.c | 4 ++--
+ tests/backend-dbus/test-actions.cc | 4 +++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
+index e154ed79..f5ddbc99 100644
+--- a/src/backend-dbus/actions.c
++++ b/src/backend-dbus/actions.c
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright 2013 Canonical Ltd.
+- * Copyright 2023 Robert Tari
++ * Copyright 2023-2025 Robert Tari
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+@@ -970,7 +970,7 @@ lock_current_session (IndicatorSessionActions * self, gboolean immediate)
+ static void
+ my_switch_to_screensaver (IndicatorSessionActions * self)
+ {
+- lock_current_session (self, FALSE);
++ lock_current_session (self, TRUE);
+ }
+
+ static void
+diff --git a/tests/backend-dbus/test-actions.cc b/tests/backend-dbus/test-actions.cc
+index bced3e97..3691cb87 100644
+--- a/tests/backend-dbus/test-actions.cc
++++ b/tests/backend-dbus/test-actions.cc
+@@ -1,8 +1,10 @@
+ /*
+ * Copyright 2013 Canonical Ltd.
++ * Copyright 2025 Robert Tari
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
++ * Robert Tari <robert@tari.in>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+@@ -361,7 +363,7 @@ TEST_F (Actions, SwitchToScreensaver)
+ ASSERT_EQ (MockLomiriSession::None, lomiri_session.last_action());
+ indicator_session_actions_switch_to_screensaver (actions);
+ wait_msec (50);
+- ASSERT_EQ (MockLomiriSession::Lock, lomiri_session.last_action());
++ ASSERT_EQ (MockLomiriSession::PromptLock, lomiri_session.last_action());
+ }
+
+ TEST_F (Actions, SwitchToGreeter)
diff -Nru ayatana-indicator-session-24.5.1/debian/patches/series ayatana-indicator-session-24.5.1/debian/patches/series
--- ayatana-indicator-session-24.5.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ ayatana-indicator-session-24.5.1/debian/patches/series 2025-06-20 16:33:12.000000000 +0200
@@ -0,0 +1 @@
+0001_src-backend-dbus-actions-c-Dont-switch-to-greeter-when-locking-Lomiri.patch
--- End Message ---