r52363 - in /desktop/unstable/gnome-shell/debian: changelog patches/50-extension-reload-fail.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Apr 26 16:47:43 2017
New Revision: 52363

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52363
Log:
* debian/patches/50-extension-reload-fail.patch:
  - Add patch to fix a bug where extensions could be left enabled in the
    lock screen.

Added:
    desktop/unstable/gnome-shell/debian/patches/50-extension-reload-fail.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=52363&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Wed Apr 26 16:47:43 2017
@@ -1,3 +1,11 @@
+gnome-shell (3.22.3-3) UNRELEASED; urgency=medium
+
+  * debian/patches/50-extension-reload-fail.patch:
+    - Add patch to fix a bug where extensions could be left enabled in the
+      lock screen.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 25 Apr 2017 17:15:44 +0200
+
 gnome-shell (3.22.3-2) unstable; urgency=medium
 
   * d/control: Drop dependency on telepathy-mission-control-5. GNOME Shell

Added: desktop/unstable/gnome-shell/debian/patches/50-extension-reload-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/50-extension-reload-fail.patch?rev=52363&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/50-extension-reload-fail.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/50-extension-reload-fail.patch	[utf-8] Wed Apr 26 16:47:43 2017
@@ -0,0 +1,45 @@
+From 560e976ee9c59d75907b5ef6ed2bc336719e37d3 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Tue, 25 Apr 2017 17:27:42 +0200
+Subject: [PATCH] extensionSystem: handle reloading broken extensions
+
+Some extensions out there may fail to reload. When that happens,
+we need to catch any exceptions so that we don't leave things in
+a broken state that could lead to leaving extensions enabled in
+the screen shield.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=781728
+---
+ js/ui/extensionSystem.js | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
+index ba332220b..1feaa2ff8 100644
+--- a/js/ui/extensionSystem.js
++++ b/js/ui/extensionSystem.js
+@@ -276,12 +276,20 @@ function _onVersionValidationChanged() {
+     // temporarily disable them all
+     enabledExtensions = [];
+     for (let uuid in ExtensionUtils.extensions)
+-        reloadExtension(ExtensionUtils.extensions[uuid]);
++        try {
++            reloadExtension(ExtensionUtils.extensions[uuid]);
++        } catch(e) {
++            logExtensionError(uuid, e);
++        }
+     enabledExtensions = getEnabledExtensions();
+ 
+     if (Main.sessionMode.allowExtensions) {
+         enabledExtensions.forEach(function(uuid) {
+-            enableExtension(uuid);
++            try {
++                enableExtension(uuid);
++            } catch(e) {
++                logExtensionError(uuid, e);
++            }
+         });
+     }
+ }
+-- 
+2.11.0
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=52363&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Wed Apr 26 16:47:43 2017
@@ -1,3 +1,4 @@
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
+50-extension-reload-fail.patch