Commit 2146124a authored by Benjamin Berg's avatar Benjamin Berg Committed by Benjamin Berg

session-fill: Disable session restoring on systemd

We cannot allow this as gnome-session would try to restore XSMP clients
that are already started using systemd, resuling in session failures.

Fixes: 41
parent 8f86fe04
...@@ -132,8 +132,11 @@ static void ...@@ -132,8 +132,11 @@ static void
load_standard_apps (GsmManager *manager, load_standard_apps (GsmManager *manager,
GKeyFile *keyfile) GKeyFile *keyfile)
{ {
/* Note that saving/restoring sessions is not really possible on systemd, as
* XSMP clients cannot be reliably mapped to .desktop files. */
g_debug ("fill: *** Adding required components"); g_debug ("fill: *** Adding required components");
handle_required_components (keyfile, !gsm_manager_get_failsafe (manager), handle_required_components (keyfile,
!gsm_manager_get_failsafe (manager) && !gsm_manager_get_systemd_managed (manager),
append_required_components_helper, manager); append_required_components_helper, manager);
g_debug ("fill: *** Done adding required components"); g_debug ("fill: *** Done adding required components");
...@@ -143,7 +146,8 @@ load_standard_apps (GsmManager *manager, ...@@ -143,7 +146,8 @@ load_standard_apps (GsmManager *manager,
autostart_dirs = gsm_util_get_autostart_dirs (); autostart_dirs = gsm_util_get_autostart_dirs ();
maybe_load_saved_session_apps (manager); if (!gsm_manager_get_systemd_managed (manager))
maybe_load_saved_session_apps (manager);
for (i = 0; autostart_dirs[i]; i++) { for (i = 0; autostart_dirs[i]; i++) {
gsm_manager_add_autostart_apps_from_dir (manager, gsm_manager_add_autostart_apps_from_dir (manager,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment