diff options
| author | Nick Schermer <nick@xfce.org> | 2011-05-25 18:33:08 +0200 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2011-09-12 21:17:15 +0200 |
| commit | 58c00ab59829a7c2085638418fc2715463ad7a7e (patch) | |
| tree | 85e0dbcac93166452f3d46d9077c9a93ea6f63c9 | |
| parent | fd395636853418dd75c9938e62609f91d5cd4b49 (diff) | |
| download | xfce4-session-58c00ab59829a7c2085638418fc2715463ad7a7e.tar.gz | |
Don't exit the session on dbus restarts.
It is a bad idea to restart dbus during a running session,
but quiting x is a bit harsh too.
(cherry picked from commit 41facd54e94e60c6359c2d7591ee3294330ba7ba)
| -rw-r--r-- | xfce4-session/xfsm-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c index 0c9ba05b..3078d6a9 100644 --- a/xfce4-session/xfsm-manager.c +++ b/xfce4-session/xfsm-manager.c @@ -1819,6 +1819,7 @@ static void xfsm_manager_dbus_init (XfsmManager *manager) { GError *error = NULL; + DBusConnection *connection; manager->session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); @@ -1830,6 +1831,9 @@ xfsm_manager_dbus_init (XfsmManager *manager) return; } + connection = dbus_g_connection_get_connection (manager->session_bus); + dbus_connection_set_exit_on_disconnect (connection, FALSE); + dbus_g_connection_register_g_object (manager->session_bus, "/org/xfce/SessionManager", G_OBJECT (manager)); |