From fecd5cdd6c585dfada5681891016f0865c7881a7 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 28 Jan 2025 11:44:59 +0100 Subject: [PATCH] shellDBus: Actually emit AcceleratorDeactivated signal Add the missing plumbing to have this signal emitted via D-Bus. Fixes: e53f69f9d ("shellDBus: Add AcceleratorDeactivated D-Bus signal") Part-of: --- js/ui/shellDBus.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js index 9f246becd..bbddefb3d 100644 --- a/js/ui/shellDBus.js +++ b/js/ui/shellDBus.js @@ -276,7 +276,7 @@ export class GnomeShell { invocation.return_value(null); } - _emitAcceleratorActivated(action, device, timestamp) { + _emitAcceleratorSignal(signal, action, device, timestamp) { let destination = this._grabbedAccelerators.get(action); if (!destination) return; @@ -296,10 +296,20 @@ export class GnomeShell { destination, this._dbusImpl.get_object_path(), info?.name ?? null, - 'AcceleratorActivated', + signal, GLib.Variant.new('(ua{sv})', [action, params])); } + _emitAcceleratorActivated(action, device, timestamp) { + this._emitAcceleratorSignal( + 'AcceleratorActivated', action, device, timestamp); + } + + _emitAcceleratorDeactivated(action, device, timestamp) { + this._emitAcceleratorSignal( + 'AcceleratorDeactivated', action, device, timestamp); + } + _grabAcceleratorForSender(accelerator, modeFlags, grabFlags, sender) { let bindingAction = global.display.grab_accelerator(accelerator, grabFlags); if (bindingAction === Meta.KeyBindingAction.NONE)