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

environment: Remove inline import of extensionUtils

Browse Source 
The logging function cannot be asynchronous, so move the override
into main.js where ExtensionUtils can be imported at the top level.
Importing ExtensionUtils in environment.js at the top level is not
possible because it would import Main prematurely.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2363>
This commit is contained in:
Evan Welsh 2022-07-05 12:11:46 -04:00
parent 61eef2fb9b
commit 4257fc9522
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/environment.js
View File

@ -316,27 +316,10 @@ function _easeActorProperty(actor, propName, target, params) {
transition.connect('stopped', (t, finished) => callback(finished)); transition.connect('stopped', (t, finished) => callback(finished));
} }
function _loggingFunc(...args) {
let fields = { 'MESSAGE': args.join(', ') };
let domain = "GNOME Shell";
// If the caller is an extension, add it as metadata
let extension = imports.misc.extensionUtils.getCurrentExtension();
if (extension != null) {
domain = extension.metadata.name;
fields['GNOME_SHELL_EXTENSION_UUID'] = extension.uuid;
fields['GNOME_SHELL_EXTENSION_NAME'] = extension.metadata.name;
}
GLib.log_structured(domain, GLib.LogLevelFlags.LEVEL_MESSAGE, fields);
}
function init() { function init() {
// Add some bindings to the global JS namespace // Add some bindings to the global JS namespace
globalThis.global = Shell.Global.get(); globalThis.global = Shell.Global.get();
globalThis.log = _loggingFunc;
globalThis._ = Gettext.gettext; globalThis._ = Gettext.gettext;
globalThis.C_ = Gettext.pgettext; globalThis.C_ = Gettext.pgettext;
globalThis.ngettext = Gettext.ngettext; globalThis.ngettext = Gettext.ngettext;

20
js/ui/main.js
View File

@ -141,7 +141,27 @@ function _sessionUpdated() {
} }
} }
/**
* @param {any...} args a list of values to log
*/
function _loggingFunc(...args) {
let fields = { 'MESSAGE': args.join(', ') };
let domain = 'GNOME Shell';
// If the caller is an extension, add it as metadata
let extension = imports.misc.extensionUtils.getCurrentExtension();
if (extension != null) {
domain = extension.metadata.name;
fields['GNOME_SHELL_EXTENSION_UUID'] = extension.uuid;
fields['GNOME_SHELL_EXTENSION_NAME'] = extension.metadata.name;
}
GLib.log_structured(domain, GLib.LogLevelFlags.LEVEL_MESSAGE, fields);
}
function start() { function start() {
globalThis.log = _loggingFunc;
// These are here so we don't break compatibility. // These are here so we don't break compatibility.
global.logError = globalThis.log; global.logError = globalThis.log;
global.log = globalThis.log; global.log = globalThis.log;