Merge lp:~azzar1/gnome-shell/fix-1768786 into lp:~ubuntu-desktop/gnome-shell/ubuntu

[Andrea Azzarone]

* debian/patches/ubuntu_lock_on_suspend.patch:
    - Inhibit suspend until the screen is locked also in the case where
      automatic screen lock is disabled and screen lock on suspend is
      enabled (LP: #1768786)

[Marco Trevisan (Treviño) (3v1n0)]

LGTM

review: Approve

[Andrea Azzarone (azzar1)]

I just updated the commit message replacing "and" with "or".

[lp:~azzar1/gnome-shell/fix-1768786]

150. By Andrea Azzarone on 2018-05-16

* debian/patches/ubuntu_lock_on_suspend.patch:
    - Inhibit suspend until the screen is locked also in the case where
      automatic screen lock is disabled and screen lock on suspend is
      enabled (LP: #1768786)

[Andrea Azzarone (azzar1)]

@seb128 commit message (and Changelog) updated!

[Sebastien Bacher (seb128)]

thanks, now I understand the description :) (&the code change also makes sense)

review: Approve

[Daniel van Vugt (vanvugt)]

It's been suggested this is really bug 1532508. Too late to deduplicate and change the commit message?

review: Needs Information

[Andrea Azzarone (azzar1)]

I disagree. bug 1532508 used to refer to the generic problem (affecting upstream Gnome Shell too). bug 1768786 refers to a specific case due to a broken distro patch.

Unmerged revisions

150. By Andrea Azzarone on 2018-05-16

* debian/patches/ubuntu_lock_on_suspend.patch:
    - Inhibit suspend until the screen is locked also in the case where
      automatic screen lock is disabled and screen lock on suspend is
      enabled (LP: #1768786)

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-23 19:56:38 +0000
+++ debian/changelog	2018-05-16 20:13:35 +0000
@@ -1,3 +1,12 @@
+gnome-shell (3.28.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/ubuntu_lock_on_suspend.patch:
+    - Inhibit suspend until the screen is locked also in the case where
+      automatic screen lock is disabled and screen lock on suspend is
+      enabled (LP: #1768786)
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 07 May 2018 22:54:23 +0200
+
 gnome-shell (3.28.1-0ubuntu2) bionic; urgency=medium
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'debian/patches/ubuntu_lock_on_suspend.patch'
--- debian/patches/ubuntu_lock_on_suspend.patch	2018-03-02 10:02:40 +0000
+++ debian/patches/ubuntu_lock_on_suspend.patch	2018-05-16 20:13:35 +0000
@@ -7,10 +7,10 @@
  js/ui/screenShield.js |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: gnome-shell-3.27.91/js/ui/screenShield.js
+Index: gnome-shell-3.28.1/js/ui/screenShield.js
 ===================================================================
---- gnome-shell-3.27.91.orig/js/ui/screenShield.js
-+++ gnome-shell-3.27.91/js/ui/screenShield.js
+--- gnome-shell-3.28.1.orig/js/ui/screenShield.js
++++ gnome-shell-3.28.1/js/ui/screenShield.js
 @@ -32,6 +32,7 @@ const Util = imports.misc.util;
  const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
  const LOCK_ENABLED_KEY = 'lock-enabled';
@@ -19,7 +19,25 @@
  
  const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
  const DISABLE_LOCK_KEY = 'disable-lock-screen';
-@@ -727,7 +728,7 @@ var ScreenShield = new Lang.Class({
+@@ -543,6 +544,7 @@ var ScreenShield = new Lang.Class({
+ 
+         this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
+         this._settings.connect('changed::' + LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
++        this._settings.connect('changed::' + SUSPEND_LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
+ 
+         this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+         this._lockSettings.connect('changed::' + DISABLE_LOCK_KEY, this._syncInhibitor.bind(this));
+@@ -707,7 +709,8 @@ var ScreenShield = new Lang.Class({
+     },
+ 
+     _syncInhibitor() {
+-        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
++        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY) ||
++                          this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY);
+         let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
+         let inhibit = (this._loginSession && this._loginSession.Active &&
+                        !this._isActive && lockEnabled && !lockLocked);
+@@ -727,7 +730,7 @@ var ScreenShield = new Lang.Class({
  
      _prepareForSleep(loginManager, aboutToSuspend) {
          if (aboutToSuspend) {