disconnect signals

micheleg · May 10, 2021 · c144b82 · c144b82
1 parent 38e3047
commit c144b82
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/appIcons.js b/appIcons.js
@@ -145,6 +145,19 @@ class MyAppIcon extends Dash.DashIcon {
 
         this._previewMenuManager = null;
         this._previewMenu = null;
+
+        let globalDnd = Meta.get_backend().get_dnd();
+        let globalDndSignals = [];
+
+        this.globalDnd = {
+            connect: function (s, f) {
+                globalDndSignals.push(globalDnd.connect(s, f))
+            },
+
+            disconnectIcon: function () {
+                globalDndSignals.forEach((e) => globalDnd.disconnect(e))
+            }
+        }
     }
 
     _onDestroy() {
@@ -168,6 +181,8 @@ class MyAppIcon extends Dash.DashIcon {
         }
 
         this._signalsHandler.destroy();
+
+        this.globalDnd.disconnectIcon();
     }
 
     // TOOD Rename this function

diff --git a/dash.js b/dash.js
@@ -529,7 +529,6 @@ var MyDash = GObject.registerClass({
 
         let switchTimerId = { id: 0 };
         let isDndTarget = false;
-        let globalDnd = Meta.get_backend().get_dnd();
         let scale = St.ThemeContext.get_for_stage(Meta.get_backend().get_stage()).scale_factor;
 
         // Detect dragging over icon (Wayland)
@@ -548,18 +547,18 @@ var MyDash = GObject.registerClass({
             isDndTarget = false;
         });
 
-        globalDnd.connect('dnd-enter', () => {
+        appIcon.globalDnd.connect('dnd-enter', () => {
             resetTimer(switchTimerId);
             isDndTarget = false;
         });
 
-        globalDnd.connect('dnd-leave', () => {
+        appIcon.globalDnd.connect('dnd-leave', () => {
             resetTimer(switchTimerId);
             isDndTarget = false;
         });
 
         // Detect dragging over icon (X11)
-        globalDnd.connect('dnd-position-change', (obj, x, y) => {
+        appIcon.globalDnd.connect('dnd-position-change', (obj, x, y) => {
             if (isCoordsInActor(x * scale, y * scale, this._scrollView) &&
                 isCoordsInActor(x * scale, y * scale, item)) {