extensionSystem: Load user extensions after system ones

https://bugzilla.gnome.org/show_bug.cgi?id=661815
This commit is contained in:
Jasper St. Pierre 2011-10-14 17:57:46 -04:00
parent 67222525ad
commit 82ed80c9c3

View File

@ -450,7 +450,6 @@ function _loadExtensionsIn(dir, type) {
} }
function loadExtensions() { function loadExtensions() {
_loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
let systemDataDirs = GLib.get_system_data_dirs(); let systemDataDirs = GLib.get_system_data_dirs();
for (let i = 0; i < systemDataDirs.length; i++) { for (let i = 0; i < systemDataDirs.length; i++) {
let dirPath = systemDataDirs[i] + '/gnome-shell/extensions'; let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
@ -458,6 +457,7 @@ function loadExtensions() {
if (dir.query_exists(null)) if (dir.query_exists(null))
_loadExtensionsIn(dir, ExtensionType.SYSTEM); _loadExtensionsIn(dir, ExtensionType.SYSTEM);
} }
_loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
} }
function InstallExtensionDialog(uuid, version_tag, name) { function InstallExtensionDialog(uuid, version_tag, name) {