From e702641f41f8b930ae0d88f6433b61f6cd36b34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 6 Mar 2023 02:01:31 +0100 Subject: [PATCH] inhibitShortcutsDialog: Stop using GTK to display shortcut Instead, switch to the corresponding mutter API. Part-of: --- js/ui/inhibitShortcutsDialog.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/js/ui/inhibitShortcutsDialog.js b/js/ui/inhibitShortcutsDialog.js index d38aae6a7..2a3e1aece 100644 --- a/js/ui/inhibitShortcutsDialog.js +++ b/js/ui/inhibitShortcutsDialog.js @@ -1,12 +1,10 @@ /* exported InhibitShortcutsDialog */ -const {Clutter, Gio, GObject, Gtk, Meta, Pango, Shell, St} = imports.gi; +const {Clutter, GObject, Meta, Pango, Shell, St} = imports.gi; const Dialog = imports.ui.dialog; const ModalDialog = imports.ui.modalDialog; const PermissionStore = imports.misc.permissionStore; -const WAYLAND_KEYBINDINGS_SCHEMA = 'org.gnome.mutter.wayland.keybindings'; - const APP_ALLOWLIST = ['org.gnome.Settings.desktop']; const APP_PERMISSIONS_TABLE = 'gnome'; const APP_PERMISSIONS_ID = 'shortcuts-inhibitor'; @@ -42,13 +40,6 @@ var InhibitShortcutsDialog = GObject.registerClass({ return windowTracker.get_window_app(this._window); } - _getRestoreAccel() { - let settings = new Gio.Settings({ schema_id: WAYLAND_KEYBINDINGS_SCHEMA }); - let accel = settings.get_strv('restore-shortcuts')[0] || ''; - return Gtk.accelerator_get_label.apply(null, - Gtk.accelerator_parse(accel)); - } - _shouldUsePermStore() { return this._app && !this._app.is_window_backed(); } @@ -79,7 +70,7 @@ var InhibitShortcutsDialog = GObject.registerClass({ : _('An app wants to inhibit shortcuts'), }); - let restoreAccel = this._getRestoreAccel(); + const restoreAccel = Meta.prefs_get_keybinding_label('restore-shortcuts'); if (restoreAccel) { let restoreLabel = new St.Label({ /* Translators: %s is a keyboard shortcut like "Super+x" */