extensionSystem: Remove the two-step initialize

Initially, extensions were loaded after they shell had fully created
the session and all objects, but this didn't allow extensions easy
ways to monkey patch prototypes, as most functions had already been
bound. Remove the historical vestigal function, and just merge the
two together.

https://bugzilla.gnome.org/show_bug.cgi?id=677586
This commit is contained in:
Jasper St. Pierre 2012-06-04 18:46:27 -04:00
parent 0805d7a35f
commit 3290bfae68
2 changed files with 1 additions and 4 deletions

View File

@ -239,12 +239,10 @@ function onEnabledExtensionsChanged() {
enabledExtensions = newEnabledExtensions;
}
function init() {
function loadExtensions() {
global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
}
function loadExtensions() {
let finder = new ExtensionUtils.ExtensionFinder();
finder.connect('extension-found', function(signals, extension) {
loadExtension(extension);

View File

@ -221,7 +221,6 @@ function start() {
false, -1, 1);
if (sessionMode.allowExtensions) {
ExtensionSystem.init();
ExtensionDownloader.init();
ExtensionSystem.loadExtensions();
}