power: Never register sleep timeout for logout in GDMbenzea/avoid-automatic-logout

We already suppress logout actions in GDM (10aa1714b05b, power: Avoid
automatic logout in GDM/greeter). However, while this prevents the
action, we may still warn.

Change it so that the corresponding timeouts will never be registered.
Leave the guard in gnome_session_logout but add a warning as we should
never be hitting that code path.

1 files changed, 10 insertions, 1 deletions

diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index cecd53f0..e45a24e7 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -985,8 +985,10 @@ static void
 gnome_session_logout (GsdPowerManager *manager,
                       guint            logout_mode)
 {
-        if (g_getenv("RUNNING_UNDER_GDM"))
+        if (g_getenv ("RUNNING_UNDER_GDM")) {
+                g_warning ("Prevented logout from GDM session! This indicates an issue in gsd-power.");
                 return;
+        }
 
         g_dbus_proxy_call (G_DBUS_PROXY (manager->session),
                            "Logout",
@@ -1808,6 +1810,13 @@ idle_configure (GsdPowerManager *manager)
                 timeout_sleep = 0;
         }
 
+        /* don't do any automatic logout if we are in GDM */
+        if (g_getenv ("RUNNING_UNDER_GDM") &&
+            (action_type == GSD_POWER_ACTION_LOGOUT)) {
+                g_debug ("Ignoring sleep timeout with logout action inside GDM");
+                timeout_sleep = 0;
+        }
+
         if (timeout_sleep != 0) {
                 g_debug ("setting up sleep callback %is", timeout_sleep);