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

status/nightLight: Use promise to initialize proxy

Browse Source 
There's no good reason for waiting for the proxy to be initialized
to connect signals. In fact, connecting the signal beforehand
ensures that the handler is in place when the proxy fetches the
properties, so we don't have to call the handler explicitly.

That in turn will allow us in a follow-up to rely on the signal
parameters to only process changed properties.

To achieve that, construct the proxy manually, and then initialize
it asynchronously in a Promise.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2391>
This commit is contained in:
Florian Müllner 2022-07-24 20:12:54 +02:00 committed by Marge Bot
parent a3dc9817f2
commit 80e4ae7d7f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/status/nightLight.js
View File

@ -1,7 +1,7 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported Indicator */ /* exported Indicator */
const { Gio, GObject } = imports.gi; const {Gio, GLib, GObject} = imports.gi;
const Main = imports.ui.main; const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu; const PanelMenu = imports.ui.panelMenu;
@ -13,7 +13,7 @@ const BUS_NAME = 'org.gnome.SettingsDaemon.Color';
const OBJECT_PATH = '/org/gnome/SettingsDaemon/Color'; const OBJECT_PATH = '/org/gnome/SettingsDaemon/Color';
const ColorInterface = loadInterfaceXML('org.gnome.SettingsDaemon.Color'); const ColorInterface = loadInterfaceXML('org.gnome.SettingsDaemon.Color');
const ColorProxy = Gio.DBusProxy.makeProxyWrapper(ColorInterface); const colorInfo = Gio.DBusInterfaceInfo.new_for_xml(ColorInterface);
var Indicator = GObject.registerClass( var Indicator = GObject.registerClass(
class Indicator extends PanelMenu.SystemIndicator { class Indicator extends PanelMenu.SystemIndicator {
@ -22,16 +22,17 @@ class Indicator extends PanelMenu.SystemIndicator {
this._indicator = this._addIndicator(); this._indicator = this._addIndicator();
this._indicator.icon_name = 'night-light-symbolic'; this._indicator.icon_name = 'night-light-symbolic';
this._proxy = new ColorProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
(proxy, error) => { this._proxy = new Gio.DBusProxy({
if (error) { g_connection: Gio.DBus.session,
log(error.message); g_name: BUS_NAME,
return; g_object_path: OBJECT_PATH,
} g_interface_name: colorInfo.name,
this._proxy.connect('g-properties-changed', g_interface_info: colorInfo,
this._sync.bind(this));
this._sync();
}); });
this._proxy.connect('g-properties-changed', () => this._sync());
this._proxy.init_async(GLib.PRIORITY_DEFAULT, null)
.catch(e => console.error(e.message));
this._item = new PopupMenu.PopupSubMenuMenuItem("", true); this._item = new PopupMenu.PopupSubMenuMenuItem("", true);
this._item.icon.icon_name = 'night-light-symbolic'; this._item.icon.icon_name = 'night-light-symbolic';