From d0e8f0cde561880967cb0f883421d4cd5b4c7c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sat, 31 Aug 2024 13:58:43 +0200
Subject: [PATCH] Code review from JustPerfection

---
 extension.js  | 12 ++++++++----
 metadata.json |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/extension.js b/extension.js
index 6eb2397..495b603 100644
--- a/extension.js
+++ b/extension.js
@@ -79,7 +79,7 @@ class SignalMgt {
         this.onScroll        = hashGet(item, 'on-scroll', '');
     }
 
-    destructor() {
+    destroy() {
         for(let widgetIdx in this.widgets)
             this.disconnectWidgetSignals(this.widgets[widgetIdx]);
         for(let timeoutIdx in this.timeouts)
@@ -394,6 +394,7 @@ class MonitorWidget extends PanelMenu.Button {
 
     destroy() {
         this.menu.close();
+        this.signalManager.destroy();
         super.destroy();
     }
 
@@ -570,7 +571,10 @@ function loadInterfaceXml(extension, filename) {
         // is no `XML` on very recent SpiderMonkey releases (or, if SpiderMonkey is old enough,
         // will spit out a TypeError soon).
         if (contents instanceof Uint8Array)
-            contents = imports.byteArray.toString(contents);
+        {
+            const decoder = new TextDecoder();
+            contents = decoder.decode(contents);
+        }
         const res = `<node>${contents}</node>`;
         return res;
     } else {
@@ -786,7 +790,7 @@ class GenericMonitorDBUS {
             monitorWidget.togglePopup();
     }
 
-    destructor() {
+    destroy() {
         this._dbusImpl.emit_signal('onDeactivate', null);
         for (let groupIndex in this.monitor_groups) {
             const group = this.monitor_groups[groupIndex];
@@ -810,7 +814,7 @@ export default class GenericMonitorExtension extends Extension.Extension {
 
     disable() {
         if (this.textDBusService !== null) {
-            this.textDBusService.destructor();
+            this.textDBusService.destroy();
             delete this.textDBusService;
             this.textDBusService = null;
         }
diff --git a/metadata.json b/metadata.json
index 66ccd17..2069281 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,5 +8,5 @@
         "46",
         "45"
     ],
-    "url": "http://indefero.soutade.fr/p/genericmonitor"
+    "url": "https://forge.soutade.fr/soutade/GnomeShellGenericMonitor"
 }