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

extensionSystem: Only load importers for enabled extensions

Browse Source 
Rather than loading and enabling all extensions at Shell init time, save some
time and gain some basic security by not loading extensions if they're
not enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=661815
This commit is contained in:
Jasper St. Pierre 2011-10-14 17:58:23 -04:00
parent 0cb415b3bd
commit 4ae2a0b2a5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/extensionSystem.js
View File

@ -62,6 +62,9 @@ const extensionMeta = {};
const extensions = {}; const extensions = {};
// Maps uuid -> extension state object (returned from init()) // Maps uuid -> extension state object (returned from init())
const extensionStateObjs = {}; const extensionStateObjs = {};
// Maps uuid -> [GFile to the extension directory, Extension type]
const extensionDirs = {};
// Arrays of uuids // Arrays of uuids
var enabledExtensions; var enabledExtensions;
// GFile for user extensions // GFile for user extensions
@ -225,8 +228,13 @@ function disableExtension(uuid) {
function enableExtension(uuid) { function enableExtension(uuid) {
let meta = extensionMeta[uuid]; let meta = extensionMeta[uuid];
if (!meta) if (!meta) {
if (extensionDirs[uuid]) {
let [dir, type] = extensionDirs[uuid];
loadExtension(dir, type);
}
return; return;
}
if (meta.state != ExtensionState.DISABLED) if (meta.state != ExtensionState.DISABLED)
return; return;
@ -254,7 +262,7 @@ function logExtensionError(uuid, message, state) {
state: state }); state: state });
} }
function loadExtension(dir, enabled, type) { function loadExtension(dir, type) {
let info; let info;
let uuid = dir.get_basename(); let uuid = dir.get_basename();
@ -383,7 +391,6 @@ function loadExtension(dir, enabled, type) {
meta.state = ExtensionState.DISABLED; meta.state = ExtensionState.DISABLED;
if (enabled)
enableExtension(uuid); enableExtension(uuid);
_signals.emit('extension-loaded', meta.uuid); _signals.emit('extension-loaded', meta.uuid);
@ -444,7 +451,9 @@ function _loadExtensionsIn(dir, type) {
let name = info.get_name(); let name = info.get_name();
let child = dir.get_child(name); let child = dir.get_child(name);
let enabled = enabledExtensions.indexOf(name) != -1; let enabled = enabledExtensions.indexOf(name) != -1;
loadExtension(child, enabled, type); extensionDirs[name] = [dir, type];
if (enabled)
loadExtension(child, type);
} }
fileEnum.close(null); fileEnum.close(null);
} }