diff --git a/src/DBus.vala b/src/DBus.vala index 8892e694c..f2982d438 100644 --- a/src/DBus.vala +++ b/src/DBus.vala @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2024 elementary, Inc. (https://elementary.io) + * SPDX-FileCopyrightText: 2024-2025 elementary, Inc. (https://elementary.io) * 2012-2014 Tom Beckmann * 2012-2014 Jacob Parker */ @@ -33,7 +33,7 @@ public class Gala.DBus { Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE, (connection) => { try { - connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm.get_display ())); + connection.register_object ("/org/gnome/Shell", new DBusAccelerator (wm.get_display ())); connection.register_object ("/org/gnome/Shell/Screenshot", screenshot_manager); } catch (Error e) { warning (e.message); } }, diff --git a/src/DBusAccelerator.vala b/src/DBusAccelerator.vala index cae78bb9f..9e33d0111 100644 --- a/src/DBusAccelerator.vala +++ b/src/DBusAccelerator.vala @@ -1,5 +1,6 @@ // // Copyright (C) 2015 Nicolas Bruguier, Corentin Noël +// 2025 elementary, Inc. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -72,23 +73,12 @@ namespace Gala { [DBus (name="org.gnome.Shell")] public class DBusAccelerator { - private static DBusAccelerator? instance; - - [DBus (visible = false)] - public static unowned DBusAccelerator init (Meta.Display display) { - if (instance == null) { - instance = new DBusAccelerator (display); - } - - return instance; - } - public signal void accelerator_activated (uint action, GLib.HashTable parameters); private Meta.Display display; private GLib.HashTable grabbed_accelerators; - private DBusAccelerator (Meta.Display _display) { + public DBusAccelerator (Meta.Display _display) { display = _display; grabbed_accelerators = new HashTable (str_hash, str_equal); display.accelerator_activated.connect (on_accelerator_activated); diff --git a/src/WindowManager.vala b/src/WindowManager.vala index cd0ff47c8..f277fed3a 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -192,7 +192,6 @@ namespace Gala { screenshot_manager = new ScreenshotManager (this); DBus.init (this, screenshot_manager); - DBusAccelerator.init (display); MediaFeedback.init (); WindowListener.init (display);