Skip to content

Commit b6f1d36

Browse files
committed
Reduce the scope of dbus_accelerator
1 parent dc52b8e commit b6f1d36

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/DBus.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Gala.DBus {
1111
private static WindowManagerGala wm;
1212

1313
[DBus (visible = false)]
14-
public static void init (WindowManagerGala _wm, DBusAccelerator dbus_accelerator, ScreenshotManager screenshot_manager) {
14+
public static void init (WindowManagerGala _wm, ScreenshotManager screenshot_manager) {
1515
wm = _wm;
1616

1717
Bus.own_name (BusType.SESSION, "org.pantheon.gala", BusNameOwnerFlags.NONE,
@@ -33,7 +33,7 @@ public class Gala.DBus {
3333
Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
3434
(connection) => {
3535
try {
36-
connection.register_object ("/org/gnome/Shell", dbus_accelerator);
36+
connection.register_object ("/org/gnome/Shell", new DBusAccelerator (wm.get_display ()));
3737
connection.register_object ("/org/gnome/Shell/Screenshot", screenshot_manager);
3838
} catch (Error e) { warning (e.message); }
3939
},

src/WindowManager.vala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ namespace Gala {
7272

7373
public WindowTracker? window_tracker { get; private set; }
7474

75-
private DBusAccelerator dbus_accelerator;
76-
7775
private ScreenshotManager screenshot_manager;
7876

7977
/**
@@ -193,8 +191,7 @@ namespace Gala {
193191
unowned Meta.Display display = get_display ();
194192

195193
screenshot_manager = new ScreenshotManager (this);
196-
dbus_accelerator = new DBusAccelerator (display);
197-
DBus.init (this, dbus_accelerator, screenshot_manager);
194+
DBus.init (this, screenshot_manager);
198195
MediaFeedback.init ();
199196

200197
WindowListener.init (display);

0 commit comments

Comments
 (0)