From f957ae71c381c3378b484edff181091cdbd95b84 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 5 Sep 2012 12:48:14 +0200 Subject: [PATCH] Don't start new components when activating the screen-shield in gdm Previous code was activating the networkAgent and telepathyClient in the lock-screen, irrespective of the previous mode. Now it checks if the session mode is locked down, and if so it refuses to start new components. https://bugzilla.gnome.org/show_bug.cgi?id=683400 --- js/ui/components/__init__.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/ui/components/__init__.js b/js/ui/components/__init__.js index 763c87d7b..cb370199d 100644 --- a/js/ui/components/__init__.js +++ b/js/ui/components/__init__.js @@ -41,6 +41,9 @@ const ComponentManager = new Lang.Class({ if (component) return component; + if (Main.sessionMode.isLocked) + return null; + let constructor = this._importComponent(name); component = new constructor(); this._allComponents[name] = component; @@ -49,7 +52,8 @@ const ComponentManager = new Lang.Class({ _enableComponent: function(name) { let component = this._ensureComponent(name); - component.enable(); + if (component) + component.enable(); }, _disableComponent: function(name) {