Merge pull request #167 from Pajn/gnome-3-34

Fix crash under Gnome 3.34

examples/keybindings.js

@@ -1,4 +1,4 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension = imports.misc.extensionUtils.getCurrentExtension();
 var Keybindings = Extension.imports.keybindings;
 var Main = imports.ui.main;
 var Tiling = Extension.imports.tiling;

extension.js

@@ -85,7 +85,7 @@ function init() {
 
     // var Gio = imports.gi.Gio;
     // let extfile = Gio.file_new_for_path( Extension.imports.extension.__file__);
-    Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+    Extension = imports.misc.extensionUtils.getCurrentExtension();
     convenience = Extension.imports.convenience;
 
     if(initRun) {

gestures.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Meta = imports.gi.Meta;
 var St = imports.gi.St;
 var Gio = imports.gi.Gio;

keybindings.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Me = Extension.imports.keybindings;
 var Gdk = imports.gi.Gdk;
 var Gtk = imports.gi.Gtk;

kludges.js

@@ -4,7 +4,13 @@
   around these problems.
  */
 
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 
 var Meta = imports.gi.Meta;
 var Main = imports.ui.main;

liveAltTab.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Clutter = imports.gi.Clutter;
 var Meta = imports.gi.Meta;
 var AltTab = imports.ui.altTab;

minimap.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org']
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Clutter = imports.gi.Clutter;
 var Tweener = imports.ui.tweener;
 var Main = imports.ui.main;

navigator.js

@@ -5,7 +5,13 @@
   `SwitcherPopup.SwitcherPopup` when we really should just take full control.
  */
 
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var SwitcherPopup = imports.ui.switcherPopup;
 var Meta = imports.gi.Meta;
 var Main = imports.ui.main;

scratch.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Meta = imports.gi.Meta;
 var Main = imports.ui.main;
 

settings.js

@@ -3,7 +3,13 @@
    Settings utility shared between the running extension and the preference UI.
 
  */
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Gio = imports.gi.Gio;
 var GLib = imports.gi.GLib;
 var Gtk = imports.gi.Gtk;

stackoverlay.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Tiling = Extension.imports.tiling;
 var Clutter = imports.gi.Clutter;
 var Tweener = imports.ui.tweener;

tiling.js

@@ -1,4 +1,10 @@
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var GLib = imports.gi.GLib;
 var Tweener = imports.ui.tweener;
 var Meta = imports.gi.Meta;
@@ -1774,7 +1780,7 @@ function registerWindow(metaWindow) {
     clone.meta_window = metaWindow;
 
     metaWindow.clone = clone;
-    metaWindow.clone.actor = cloneActor;
+    metaWindow.clone.cloneActor = cloneActor;
 
     signals.connect(metaWindow, "focus", focus_wrapper);
     // Note: runs before gnome-shell's minimize handling code
@@ -1792,7 +1798,7 @@ function allocateClone(actor) {
     // Adjust the clone's origin to the north-west, so it will line up
     // with the frame.
     let clone = metaWindow.clone;
-    let cloneActor = clone.actor;
+    let cloneActor = clone.cloneActor;
     cloneActor.set_position(actor.x - frame.x,
                        actor.y - frame.y);
     clone.set_size(frame.width, frame.height);
@@ -2179,7 +2185,7 @@ function ensureViewport(meta_window, space, force) {
 
 function updateSelection(space, metaWindow) {
     let clone = metaWindow.clone;
-    let cloneActor = clone.actor;
+    let cloneActor = clone.cloneActor;
     space.setSelectionActive();
     if (space.selection.get_parent() === clone)
         return;
@@ -2383,7 +2389,7 @@ function showWindow(metaWindow) {
     let actor = metaWindow.get_compositor_private();
     if (!actor)
         return false;
-    metaWindow.clone.actor.hide();
+    metaWindow.clone.cloneActor.hide();
     actor.show();
     return true;
 }
@@ -2392,14 +2398,14 @@ function animateWindow(metaWindow) {
     let actor = metaWindow.get_compositor_private();
     if (!actor)
         return false;
-    metaWindow.clone.actor.show();
+    metaWindow.clone.cloneActor.show();
     actor.hide();
     return true;
 }
 
 function isWindowAnimating(metaWindow) {
     let clone = metaWindow.clone;
-    return clone.get_parent() && clone.actor.visible;
+    return clone.get_parent() && clone.cloneActor.visible;
 }
 
 function toggleMaximizeHorizontally(metaWindow) {

topbar.js

@@ -2,7 +2,13 @@
   Functionality related to the top bar, often called the statusbar.
  */
 
-var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org'];
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
+
 var Meta = imports.gi.Meta;
 var St = imports.gi.St;
 var Gio = imports.gi.Gio;

utils.js

@@ -1,4 +1,9 @@
-const Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org']
+var Extension;
+if (imports.misc.extensionUtils.extensions) {
+    Extension = imports.misc.extensionUtils.extensions["paperwm@hedning:matrix.org"];
+} else {
+    Extension = imports.ui.main.extensionManager.lookup("paperwm@hedning:matrix.org");
+}
 const Gdk = imports.gi.Gdk;
 var GLib = imports.gi.GLib;
 var Meta = imports.gi.Meta;