[gnome-session/wip/benzea/systemd-user-switch: 11/13] manager: Drop DBus restart as it is handled using systemd
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-session/wip/benzea/systemd-user-switch: 11/13] manager: Drop DBus restart as it is handled using systemd
- Date: Fri, 10 May 2019 15:06:13 +0000 (UTC)
commit 5713e7e19411982b5d4777b0692f41008103e008
Author: Benjamin Berg <bberg redhat com>
Date: Wed Apr 17 11:11:53 2019 +0200
manager: Drop DBus restart as it is handled using systemd
The stop target now unconditionally restarts DBus. This effectively
removes the check that the user has no other session, but we do not
currently support multiple graphical sessions anyway.
gnome-session/gsm-manager.c | 38 --------------------------------------
1 file changed, 38 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 12d277e9..477a7834 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -957,40 +957,6 @@ _client_stop (const char *id,
return FALSE;
}
-#ifdef HAVE_SYSTEMD
-static void
-maybe_restart_user_bus (GsmManager *manager)
-{
- GsmSystem *system;
- g_autoptr(GVariant) reply = NULL;
- g_autoptr(GError) error = NULL;
-
- if (manager->priv->dbus_disconnected)
- return;
-
- system = gsm_get_system ();
-
- if (!gsm_system_is_last_session_for_user (system))
- return;
-
- reply = g_dbus_connection_call_sync (manager->priv->connection,
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "TryRestartUnit",
- g_variant_new ("(ss)", "dbus.service", "replace"),
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
-
- if (error != NULL) {
- g_debug ("GsmManager: reloading user bus failed: %s", error->message);
- }
-}
-#endif
-
static void
do_phase_exit (GsmManager *manager)
{
@@ -1000,10 +966,6 @@ do_phase_exit (GsmManager *manager)
NULL);
}
-#ifdef HAVE_SYSTEMD
- maybe_restart_user_bus (manager);
-#endif
-
end_phase (manager);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]