[gnome-shell/gnome-3-36] screenShield: Wake up on deactivate()
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-36] screenShield: Wake up on deactivate()
- Date: Fri, 3 Apr 2020 15:09:34 +0000 (UTC)
commit dfcc5ffb1e2b7a8e5ad59b1f83133c06a5b8ff7c
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Mar 31 19:07:59 2020 +0000
screenShield: Wake up on deactivate()
Usually the screen is woken up before the shield is deactivated, but
it is also possible to unlock the session programmatically via the
org.gnome.ScreenSaver D-Bus API.
The intention is very likely not to unlock a turned off screen in
that case. Nor does it seem like a good idea to change the lock
state without any indication.
Waking up the screen is more likely to meet expectations and is
more reasonable too, so do that.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1158
(cherry picked from commit fbe2e30f389a10b5b155ab7b2179d9fd718e762b)
js/ui/screenShield.js | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 1107a5ce96..86221a3093 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -498,6 +498,8 @@ var ScreenShield = class {
if (Main.sessionMode.currentMode == 'unlock-dialog')
Main.sessionMode.popMode('unlock-dialog');
+ this.emit('wake-up-screen');
+
if (this._isGreeter) {
// We don't want to "deactivate" any more than
// this. In particular, we don't want to drop
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]