New upstream version 23

3 files changed, 7 insertions, 10 deletions

diff --git a/bluetooth.js b/bluetooth.js
index 231578f..d0708b4 100644
--- a/bluetooth.js
+++ b/bluetooth.js
@@ -100,7 +100,7 @@ var BluetoothDevice = class {
     }
 
     update(iter) {
-        this.name = this._model.get_value(iter, GnomeBluetooth.Column.NAME);
+        this.name = this._model.get_value(iter, GnomeBluetooth.Column.ALIAS) || this._model.get_value(iter, GnomeBluetooth.Column.NAME);
         this.isConnected = this._model.get_value(iter, GnomeBluetooth.Column.CONNECTED);
         this.isPaired = this._model.get_value(iter, GnomeBluetooth.Column.PAIRED);
         this.mac = this._model.get_value(iter, GnomeBluetooth.Column.ADDRESS);
diff --git a/extension.js b/extension.js
index b08d77b..58d0aa8 100644
--- a/extension.js
+++ b/extension.js
@@ -187,13 +187,13 @@ Utils.addSignalsHelperMethods(BluetoothQuickConnect.prototype);
 
 let bluetoothQuickConnect = null;
 
-function init() {
-    let bluetooth = Main.panel.statusArea.aggregateMenu._bluetooth;
-    let settings = new Settings();
-    bluetoothQuickConnect = new BluetoothQuickConnect(bluetooth, settings);
-}
+function init() {}
 
 function enable() {
+    bluetoothQuickConnect = new BluetoothQuickConnect(
+        Main.panel.statusArea.aggregateMenu._bluetooth,
+        new Settings()
+    );
     bluetoothQuickConnect.test();
     bluetoothQuickConnect.enable();
 }
diff --git a/metadata.json b/metadata.json
index 0d814bc..feef4f2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -6,9 +6,6 @@
   "settings-schema": "org.gnome.shell.extensions.bluetooth-quick-connect",
   "gettext-domain": "bluetooth-quick-connect",
   "shell-version": [
-    "40.1",
-    "40.0",
-    "40.beta",
-    "40.rc"
+    "40"
   ]
 }