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

extensionUtils: Always use manager to find current extension

Browse Source 
Now that we always have an extension manager object, we can use
the same code path for use from extensions and prefs.

For that, inject the D-Bus service's extensionManager instead
of the current extension.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2832>
This commit is contained in:
Florian Müllner
2023-07-09 12:47:05 +02:00
committed by Marge Bot
parent 10672597c2
commit df350cab0a
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/misc/extensionUtils.js
View File

@ -2,7 +2,7 @@
/* exported ExtensionState, ExtensionType, getCurrentExtension,
getSettings, initTranslations, gettext, ngettext, pgettext,
openPrefs, isOutOfDate, serializeExtension,
deserializeExtension, setCurrentExtension */
deserializeExtension, setExtensionManager */
// Common utils for the extension system and the extension
// preferences tool
@ -14,18 +14,7 @@ const Gettext = imports.gettext;
const Config = imports.misc.config;
let Main = null;
try {
Main = imports.ui.main;
} catch (error) {
// Only log the error if it is not due to the
// missing import.
if (error?.name !== 'ImportError')
console.error(error);
}
let _extension = null;
let _extensionManager = null;
var ExtensionType = {
SYSTEM: 1,
@ -58,13 +47,13 @@ const SERIALIZED_PROPERTIES = [
];
/**
* @param {object} extension the extension object to use in utilities like `initTranslations()`
* @param {object} extensionManager to use in utilities like `initTranslations()`
*/
function setCurrentExtension(extension) {
if (Main)
throw new Error('setCurrentExtension() can only be called from outside the shell');
function setExtensionManager(extensionManager) {
if (_extensionManager)
throw new Error('Trying to override existing extension manager');
_extension = extension;
_extensionManager = extensionManager;
}
/**
@ -74,9 +63,6 @@ function setCurrentExtension(extension) {
* an extension.
*/
function getCurrentExtension() {
if (_extension)
return _extension;
const basePath = '/gnome-shell/extensions/';
// Search for an occurrence of an extension stack frame
@ -89,8 +75,9 @@ function getCurrentExtension() {
return null;
// local import, as the module is used from outside the gnome-shell process
// as well (not this function though)
let extensionManager = imports.ui.main.extensionManager;
// as well
if (!_extensionManager)
setExtensionManager(imports.ui.main.extensionManager);
// The exact stack line differs depending on where the function
// was called (function or module scope), and whether it's called
@ -106,7 +93,7 @@ function getCurrentExtension() {
path = GLib.path_get_dirname(path);
const dirName = GLib.path_get_basename(path);
const extension = extensionManager.lookup(dirName);
const extension = _extensionManager.lookup(dirName);
if (extension !== undefined)
return extension;
} while (path !== '/');