brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ScreenShield: separate notifications for active and locked

Browse Source 
Now that we have an explicit active-but-not-locked state, we should
use different signals to notify changes. lock-status-changed is
renamed to active-changed, and a new locked-changed is introduced.

https://bugzilla.gnome.org/show_bug.cgi?id=693007
This commit is contained in:
Giovanni Campagna 2013-02-02 17:10:45 +01:00
parent d367566db9
commit ae0accb5a4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/screenShield.js
View File

@ -536,6 +536,7 @@ const ScreenShield = new Lang.Class({
this._hasLockScreen = false; this._hasLockScreen = false;
this._isGreeter = false; this._isGreeter = false;
this._isActive = false; this._isActive = false;
this._isLocked = false;
this._inUnlockAnimation = false; this._inUnlockAnimation = false;
this._activationTime = 0; this._activationTime = 0;
this._becameActiveId = 0; this._becameActiveId = 0;
@ -956,7 +957,7 @@ const ScreenShield = new Lang.Class({
this._isActive = true; this._isActive = true;
if (prevIsActive != this._isActive) if (prevIsActive != this._isActive)
this.emit('lock-status-changed'); this.emit('active-changed');
this.emit('lock-screen-shown'); this.emit('lock-screen-shown');
}, },
@ -1067,7 +1068,8 @@ const ScreenShield = new Lang.Class({
this._activationTime = 0; this._activationTime = 0;
this._isActive = false; this._isActive = false;
this._isLocked = false; this._isLocked = false;
this.emit('lock-status-changed'); this.emit('active-changed');
this.emit('locked-changed');
}, },
activate: function(animate) { activate: function(animate) {
@ -1085,7 +1087,7 @@ const ScreenShield = new Lang.Class({
this._resetLockScreen(animate, animate); this._resetLockScreen(animate, animate);
// We used to set isActive and emit lock-status-changed here, // We used to set isActive and emit active-changed here,
// but now we do that from lockScreenShown, which means // but now we do that from lockScreenShown, which means
// there is a 0.3 seconds window during which the lock // there is a 0.3 seconds window during which the lock
// screen is effectively visible and the screen is locked, but // screen is effectively visible and the screen is locked, but
@ -1105,6 +1107,8 @@ const ScreenShield = new Lang.Class({
this._isLocked = true; this._isLocked = true;
this.activate(animate); this.activate(animate);
this.emit('locked-changed');
}, },
}); });
Signals.addSignalMethods(ScreenShield.prototype); Signals.addSignalMethods(ScreenShield.prototype);
@ -1138,13 +1142,13 @@ const ScreenShieldFallback = new Lang.Class({
else else
this._locked = false; this._locked = false;
this.emit('lock-status-changed', this._locked); this.emit('active-changed', this._locked);
}, },
_onSignal: function(proxy, senderName, signalName, params) { _onSignal: function(proxy, senderName, signalName, params) {
if (signalName == 'ActiveChanged') { if (signalName == 'ActiveChanged') {
[this._locked] = params.deep_unpack(); [this._locked] = params.deep_unpack();
this.emit('lock-status-changed', this._locked); this.emit('active-changed', this._locked);
} }
}, },

2
js/ui/shellDBus.js
View File

@ -247,7 +247,7 @@ const ScreenSaverDBus = new Lang.Class({
this.parent(); this.parent();
this._screenShield = screenShield; this._screenShield = screenShield;
screenShield.connect('lock-status-changed', Lang.bind(this, function(shield) { screenShield.connect('active-changed', Lang.bind(this, function(shield) {
this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active])); this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active]));
})); }));