--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js 2012-05-13 23:30:06.000000000 +0100
+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js 2012-05-28 21:49:03.472325821 +0100
@@ -40,7 +40,7 @@ const PowerManagerInterface = {
{ name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
],
signals: [
- { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
+ { name: 'Changed', inSignature: '' },
],
properties: [
{ name: 'Icon', signature: 's', access: 'read' },
@@ -48,20 +48,6 @@ const PowerManagerInterface = {
};
let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
-const SettingsManagerInterface = {
- name: 'org.freedesktop.DBus.Properties',
- methods: [
- { name: 'Get', inSignature: 's,s', outSignature: 'v' },
- { name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' },
- { name: 'Set', inSignature: 's,s,v', outSignature: '' }
- ],
- signals: [
- {name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''}
- ]
-};
-
-let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface);
-
function DeviceItem() {
this._init.apply(this, arguments);
}
@@ -136,7 +122,6 @@ MyApplet.prototype = {
this.set_applet_icon_symbolic_name('battery-missing');
this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
- this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
let icon = this.actor.get_children()[0];
this.actor.remove_actor(icon);
@@ -163,7 +148,7 @@ MyApplet.prototype = {
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
- this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+ this._proxy.connect('Changed', Lang.bind(this, this._devicesChanged));
this._devicesChanged();
}
catch (e) {