cleanup: Connect to signals with non-array arguments when possible

Author: 3v1n0

appIconIndicators.js

@@ -317,11 +317,11 @@ var RunningIndicatorDots = class DashToDock_RunningIndicatorDots extends Running
                    'running-indicator-dominant-color'];
 
         keys.forEach(function(key) {
-            this._signalsHandler.add([
+            this._signalsHandler.add(
                 Docking.DockManager.settings,
                 'changed::' + key,
                 this.update.bind(this)
-            ]);
+            );
         }, this);
 
         // Apply glossy background

appIcons.js

@@ -111,11 +111,10 @@ class MyAppIcon extends Dash.DashIcon {
         if (Docking.DockManager.settings.get_boolean('isolate-monitors') &&
             Main.layoutManager.monitors.length > 1) {
             this._signalsHandler.removeWithLabel('isolate-monitors');
-            this._signalsHandler.addWithLabel('isolate-monitors', [
+            this._signalsHandler.addWithLabel('isolate-monitors',
                 global.display,
                 'window-entered-monitor',
-                this._onWindowEntered.bind(this)
-            ]);
+                this._onWindowEntered.bind(this));
         }
 
         this._progressOverlayArea = null;
@@ -126,19 +125,19 @@ class MyAppIcon extends Dash.DashIcon {
                     ];
 
         keys.forEach(function(key) {
-            this._signalsHandler.add([
+            this._signalsHandler.add(
                 Docking.DockManager.settings,
                 'changed::' + key,
                 this._updateIndicatorStyle.bind(this)
-            ]);
+            );
         }, this);
 
         if (this._location) {
-            this._signalsHandler.add([
+            this._signalsHandler.add(
                 Docking.DockManager.getDefault().fm1Client,
                 'windows-changed',
                 this.onWindowsChanged.bind(this)
-            ]);
+            );
         }
 
         this._numberOverlay();

dash.js

@@ -742,9 +742,7 @@ var MyDash = GObject.registerClass({
             if (!this._removables) {
                 this._removables = new Locations.Removables();
                 this._signalsHandler.addWithLabel('show-mounts',
-                    [ this._removables,
-                      'changed',
-                      this._queueRedisplay.bind(this) ]);
+                    this._removables, 'changed', this._queueRedisplay.bind(this));
             }
             Array.prototype.push.apply(newApps, this._removables.getApps());
         } else if (this._removables) {
@@ -756,10 +754,8 @@ var MyDash = GObject.registerClass({
         if (settings.get_boolean('show-trash')) {
             if (!this._trash) {
                 this._trash = new Locations.Trash();
-                this._signalsHandler.addWithLabel('show-trash',
-                    [ this._trash,
-                      'changed',
-                      this._queueRedisplay.bind(this) ]);
+                this._signalsHandler.addWithLabel('show-trash', this._trash,
+                    'changed', this._queueRedisplay.bind(this));
             }
             newApps.push(this._trash.getApp());
         } else if (this._trash) {

dbusmenuUtils.js

@@ -261,7 +261,7 @@ function makePopupMenuItem(dbusmenuItem, deep) {
         item.icon.icon_size = 16;
     }
 
-    signalsHandler.add([dbusmenuItem, Dbusmenu.MENUITEM_SIGNAL_PROPERTY_CHANGED, onPropertyChanged]);
+    signalsHandler.add(dbusmenuItem, Dbusmenu.MENUITEM_SIGNAL_PROPERTY_CHANGED, onPropertyChanged);
 
     // Connections on item will be lost when item is disposed; there's no need
     // to add them to signalsHandler.

docking.js

@@ -1134,11 +1134,10 @@ var DockedDash = GObject.registerClass({
         function enable() {
             this._signalsHandler.removeWithLabel(label);
 
-            this._signalsHandler.addWithLabel(label, [
+            this._signalsHandler.addWithLabel(label,
                 this._box,
                 'scroll-event',
-                onScrollEvent.bind(this)
-            ]);
+                onScrollEvent.bind(this));
         }
 
         function disable() {
@@ -1470,12 +1469,10 @@ var WorkspaceIsolation = class DashToDock_WorkspaceIsolation {
             // This last signal is only needed for monitor isolation, as windows
             // might migrate from one monitor to another without triggering 'restacked'
             if (DockManager.settings.get_boolean('isolate-monitors'))
-                this._signalsHandler.addWithLabel('isolation', [
+                this._signalsHandler.addWithLabel('isolation',
                     global.display,
                     'window-entered-monitor',
-                    dock.dash._queueRedisplay.bind(dock.dash)
-                ]);
-
+                    dock.dash._queueRedisplay.bind(dock.dash));
         }, this);
 
         // here this is the Shell.App
@@ -1493,11 +1490,10 @@ var WorkspaceIsolation = class DashToDock_WorkspaceIsolation {
             return this.open_new_window(-1);
         }
 
-        this._injectionsHandler.addWithLabel('isolation', [
+        this._injectionsHandler.addWithLabel('isolation',
             Shell.App.prototype,
             'activate',
-            IsolatedOverview
-        ]);
+            IsolatedOverview);
     }
 
     _disable () {

theming.js

@@ -291,13 +291,11 @@ var ThemeManager = class DashToDock_ThemeManager {
                     'extend-height',
                     'force-straight-corner'];
 
-        keys.forEach(function(key) {
-            this._signalsHandler.add([
-                Docking.DockManager.settings,
-                'changed::' + key,
-                this.updateCustomTheme.bind(this)
-           ]);
-        }, this);
+        this._signalsHandler.add(...keys.map(key => [
+            Docking.DockManager.settings,
+            `changed::${key}`,
+            () => this.updateCustomTheme(),
+        ]));
     }
 };