5f86e29830
Fix the signal handling; you can't use this.connect('ActiveChanged')
to connect to a D-Bus signal after replacing the signal methods with
the lang.signals versions. Just leave it using the D-Bus signal names,
just like it uses the D-Bus method names.
Also, remove the "_" from "_screenSaverActive", to match what
AutomountManager checks for, and remove getActive(), since it's not
needed.
https://bugzilla.gnome.org/show_bug.cgi?id=654550
54 lines
1.6 KiB
JavaScript
54 lines
1.6 KiB
JavaScript
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
|
|
|
const DBus = imports.dbus;
|
|
const Lang = imports.lang;
|
|
|
|
const ScreenSaverIface = {
|
|
name: 'org.gnome.ScreenSaver',
|
|
methods: [{ name: 'GetActive',
|
|
inSignature: '',
|
|
outSignature: 'b' },
|
|
{ name: 'Lock',
|
|
inSignature: '' },
|
|
{ name: 'SetActive',
|
|
inSignature: 'b' }],
|
|
signals: [{ name: 'ActiveChanged',
|
|
inSignature: 'b' }]
|
|
};
|
|
|
|
function ScreenSaverProxy() {
|
|
this._init();
|
|
}
|
|
|
|
ScreenSaverProxy.prototype = {
|
|
_init: function() {
|
|
DBus.session.proxifyObject(this,
|
|
'org.gnome.ScreenSaver',
|
|
'/org/gnome/ScreenSaver');
|
|
|
|
DBus.session.watch_name('org.gnome.ScreenSaver',
|
|
false, // do not launch a name-owner if none exists
|
|
Lang.bind(this, this._onSSAppeared),
|
|
Lang.bind(this, this._onSSVanished));
|
|
|
|
this.screenSaverActive = false;
|
|
this.connect('ActiveChanged',
|
|
Lang.bind(this, this._onActiveChanged));
|
|
},
|
|
|
|
_onSSAppeared: function(owner) {
|
|
this.GetActiveRemote(Lang.bind(this, function(isActive) {
|
|
this.screenSaverActive = isActive;
|
|
}))
|
|
},
|
|
|
|
_onSSVanished: function(oldOwner) {
|
|
this.screenSaverActive = false;
|
|
},
|
|
|
|
_onActiveChanged: function(object, isActive) {
|
|
this.screenSaverActive = isActive;
|
|
}
|
|
};
|
|
DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface);
|