Björn Daase · bjarosze · Marti Raudsepp · Fran Dieguez · Fran Dieguez · bjarosze
--- a/.extract.sh
+++ b/.extract.sh
@@ -14,7 +14,7 @@ fi
 mkdir -p "$dir"
 cd "$dir"

-GS=/usr/lib/gnome-shell/libgnome-shell.so
+GS=/usr/lib64/gnome-shell/libgnome-shell.so

 for r in $(gresource list $GS); do
    t="${r/#\/org\/gnome\/shell\/}"

--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,7 @@ dist: all
 clean:
 	rm -fr gnome-bluetooth-quick-connect.zip schemas/gschemas.compiled

+install: dist
+	gnome-extensions install --force gnome-bluetooth-quick-connect.zip
+
 .PHONY: all clean dist
--- a/Settings.ui
+++ b/Settings.ui
--- a/metadata.json
+++ b/metadata.json
@@ -6,6 +6,9 @@
  "settings-schema": "org.gnome.shell.extensions.bluetooth-quick-connect",
  "gettext-domain": "bluetooth-quick-connect",
  "shell-version": [
-    "3.38"
+    "40.1",
+    "40.0",
+    "40.beta",
+    "40.rc"
  ]
 }
--- a/prefs.js
+++ b/prefs.js
@@ -21,33 +21,27 @@ class SettingsBuilder {

    build() {
        this._builder.add_from_file(Me.path + '/Settings.ui');
-        this._settingsBox = this._builder.get_object('bluetooth_quick_connect_settings');
-
-
-        this._viewport = new Gtk.Viewport();
-        this._viewport.add(this._settingsBox);
-        this._widget = new Gtk.ScrolledWindow();
-        this._widget.add(this._viewport);

+        this._widget = this._builder.get_object('items_container')

        this._builder.get_object('auto_power_off_settings_button').connect('clicked', () => {
            let dialog = new Gtk.Dialog({
                title: 'Auto power off settings',
-                transient_for: this._widget.get_toplevel(),
+                transient_for: this._widget.get_ancestor(Gtk.Window),
                use_header_bar: true,
                modal: true
            });


            let box = this._builder.get_object('auto_power_off_settings');
-            dialog.get_content_area().add(box);
+            dialog.get_content_area().append(box);

            dialog.connect('response', (dialog) => {
                dialog.get_content_area().remove(box);
                dialog.destroy();
            });

-            dialog.show_all();
+            dialog.show();
        });


@@ -84,7 +78,6 @@ function init() {
 function buildPrefsWidget() {
    let settings = new SettingsBuilder();
    let widget = settings.build();
-    widget.show_all();

    return widget;
 }
--- a/settings.js
+++ b/settings.js
@@ -18,7 +18,7 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Gio = imports.gi.Gio;
 const GioSSS = Gio.SettingsSchemaSource;

-class Settings {
+var Settings = class Settings {
    constructor() {
        this.settings = this._loadSettings();
    }
@@ -59,6 +59,6 @@ class Settings {

        let schemaObj = schemaSource.lookup(schema, true);

-        return new Gio.Settings({settings_schema: schemaObj});
+        return new Gio.Settings({ settings_schema: schemaObj });
    }
-}
\ No newline at end of file
+};
\ No newline at end of file
--- a/ui.js
+++ b/ui.js
@@ -24,7 +24,8 @@ const Config = imports.misc.config;
 var PopupBluetoothDeviceMenuItem = GObject.registerClass(
    class PopupSwitchWithButtonMenuItem extends PopupMenu.PopupSwitchMenuItem {
        _init(device, params) {
-            super._init(device.name, device.isConnected, {});
+            let label = device.name || '(unknown)';
+            super._init(label, device.isConnected, {});

            this._device = device;
            this._showRefreshButton = params.showRefreshButton;

--- a/utils.js
+++ b/utils.js
@@ -34,7 +34,7 @@ function isDebugModeEnabled() {
    return new Settings().isDebugModeEnabled();
 }

-class Logger {
+var Logger = class Logger {
    constructor(settings) {
        this._enabled = settings.isDebugModeEnabled();
    }
@@ -42,9 +42,9 @@ class Logger {
    info(message) {
        if (!this._enabled) return;

-        global.log(`[bluetooth-quick-connect] ${message}`);
+        log(`[bluetooth-quick-connect] ${message}`);
    }
-}
+};

 function addSignalsHelperMethods(prototype) {
    prototype._connectSignal = function (subject, signal_name, method) {