[gnome-shell] extensionUtils: Use a unique 'subdir' to create new importers



commit d769b72c43acd0297b8ccbe48796f0a316caaed3
Author: Florian Müllner <fmuellner gnome org>
Date:   Mon Oct 17 23:05:05 2016 +0200

    extensionUtils: Use a unique 'subdir' to create new importers
    
    Apparently importers for the 'same' path are shared, even when the
    relative paths resolve to different absolute ones. Until this bug
    is fixed properly, we can work around this by expressing the current
    extension path as the UUID relative to the parent directory.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772386

 js/misc/extensionUtils.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 65d02c2..15438c2 100644
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -151,10 +151,10 @@ function createExtensionObject(uuid, dir, type) {
 
 function installImporter(extension) {
     let oldSearchPath = imports.searchPath.slice();  // make a copy
-    imports.searchPath = [extension.path];
+    imports.searchPath = [extension.dir.get_parent().get_path()];
     // importing a "subdir" creates a new importer object that doesn't affect
     // the global one
-    extension.imports = imports['.'];
+    extension.imports = imports[extension.uuid];
     imports.searchPath = oldSearchPath;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]