Avoid making DBusAccelerator static

Author: lenemter

src/DBus.vala

@@ -11,7 +11,7 @@ public class Gala.DBus {
     private static WindowManagerGala wm;
 
     [DBus (visible = false)]
-    public static void init (WindowManagerGala _wm, ScreenshotManager screenshot_manager) {
+    public static void init (WindowManagerGala _wm, DBusAccelerator dbus_accelerator, ScreenshotManager screenshot_manager) {
         wm = _wm;
 
         Bus.own_name (BusType.SESSION, "org.pantheon.gala", BusNameOwnerFlags.NONE,
@@ -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", dbus_accelerator);
                     connection.register_object ("/org/gnome/Shell/Screenshot", screenshot_manager);
                 } catch (Error e) { warning (e.message); }
             },

src/DBusAccelerator.vala

@@ -72,23 +72,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<string, Variant> parameters);
 
         private Meta.Display display;
         private GLib.HashTable<unowned string, GrabbedAccelerator> grabbed_accelerators;
 
-        private DBusAccelerator (Meta.Display _display) {
+        public DBusAccelerator (Meta.Display _display) {
             display = _display;
             grabbed_accelerators = new HashTable<unowned string, GrabbedAccelerator> (str_hash, str_equal);
             display.accelerator_activated.connect (on_accelerator_activated);

src/WindowManager.vala

@@ -71,6 +71,8 @@ namespace Gala {
 
         public WindowTracker? window_tracker { get; private set; }
 
+        private DBusAccelerator dbus_accelerator;
+
         private ScreenshotManager screenshot_manager;
 
         /**
@@ -190,8 +192,8 @@ namespace Gala {
             unowned Meta.Display display = get_display ();
 
             screenshot_manager = new ScreenshotManager (this);
-            DBus.init (this, screenshot_manager);
-            DBusAccelerator.init (display);
+            dbus_accelerator = new DBusAccelerator (display);
+            DBus.init (this, dbus_accelerator, screenshot_manager);
             MediaFeedback.init ();
 
             WindowListener.init (display);