Skip to content

DBus: cleanup #2609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 15, 2025
+46 −32
Merged

DBus: cleanup #2609

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f88d7f0
DBus: use `Bus.own_name_on_connection` to own name
lenemter Oct 29, 2025
cfbee0d
Use `own_name`
lenemter Oct 29, 2025
7517b72
Fix code style
lenemter Nov 13, 2025
b9dbdbe
Merge branch 'main' into lenemter/fix-dbus-name-owning
lenemter Nov 13, 2025
0f77017
Merge branch 'main' into lenemter/fix-dbus-name-owning
lenemter Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 41 additions & 33 deletions src/DBus.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,67 +14,75 @@ public class Gala.DBus {
public static void init (WindowManagerGala _wm, NotificationsManager notifications_manager, ScreenshotManager screenshot_manager) {
wm = _wm;

Bus.own_name (
SESSION, "io.elementary.gala", NONE,
(connection) => {
Bus.own_name (SESSION, "io.elementary.gala", NONE, null,
(connection, name) => {
try {
connection.register_object ("/io/elementary/gala", WindowDragProvider.get_instance ());
} catch (Error e) {
warning (e.message);
}
},
() => {},
() => critical ("Could not acquire name")
print_warning
);

Bus.own_name (BusType.SESSION, "org.pantheon.gala", BusNameOwnerFlags.NONE,
(connection) => {
if (instance == null)
Bus.own_name (SESSION, "org.pantheon.gala", NONE, null,
(connection, name) => {
if (instance == null) {
instance = new DBus ();
}

try {
connection.register_object ("/org/pantheon/gala", instance);
} catch (Error e) { warning (e.message); }

try {
connection.register_object ("/org/pantheon/gala/DesktopInterface", new DesktopIntegration (wm));
} catch (Error e) { warning (e.message); }
} catch (Error e) {
warning (e.message);
}
},
() => {},
() => warning ("Could not acquire name\n") );
print_warning
);

Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
(connection) => {
Bus.own_name (SESSION, "org.gnome.Shell", NONE, null,
(connection, name) => {
try {
connection.register_object ("/org/gnome/Shell", new DBusAccelerator (wm.get_display (), notifications_manager));
connection.register_object ("/org/gnome/Shell/Screenshot", screenshot_manager);
} catch (Error e) { warning (e.message); }
} catch (Error e) {
warning (e.message);
}
},
() => {},
() => critical ("Could not acquire name") );
print_warning
);

Bus.own_name (BusType.SESSION, "org.gnome.Shell.Screenshot", BusNameOwnerFlags.REPLACE,
() => {},
() => {},
() => critical ("Could not acquire name") );
Bus.own_name (SESSION, "org.gnome.Shell.Screenshot", REPLACE,
null,
print_warning
);

Bus.own_name (BusType.SESSION, "org.gnome.SessionManager.EndSessionDialog", BusNameOwnerFlags.NONE,
(connection) => {
Bus.own_name (SESSION, "org.gnome.SessionManager.EndSessionDialog", NONE, null,
(connection, name) => {
try {
connection.register_object ("/org/gnome/SessionManager/EndSessionDialog", SessionManager.init ());
} catch (Error e) { warning (e.message); }
} catch (Error e) {
warning (e.message);
}
},
() => {},
() => critical ("Could not acquire name") );
print_warning
);

Bus.own_name (BusType.SESSION, "org.gnome.ScreenSaver", BusNameOwnerFlags.REPLACE,
(connection) => {
Bus.own_name (SESSION, "org.gnome.ScreenSaver", REPLACE, null,
(connection, name) => {
try {
connection.register_object ("/org/gnome/ScreenSaver", wm.screensaver);
} catch (Error e) { warning (e.message); }
} catch (Error e) {
warning (e.message);
}
},
() => {},
() => critical ("Could not acquire ScreenSaver bus") );
print_warning
);
}

private static void print_warning (GLib.DBusConnection connection, string name) {
warning ("DBus: Lost name %s", name);
}

public void perform_action (ActionType type) throws DBusError, IOError {
Expand Down