[gnome-session] manager: restart gnome-shell on X11 if it crashes

[Ray Strode <halfline src gnome org>]

commit 91e74ccf2e6a28f53e181b18c59f4474b00ab483
Author: Ray Strode <rstrode redhat com>
Date:   Wed Jan 13 16:19:05 2016 -0500

    manager: restart gnome-shell on X11 if it crashes
    
    gnome-shell calls itself a DisplayServer for ordering reasons,
    and because we share one file between wayland an X11.
    
    gnome-session currently doesn't try to restart a DisplayServer if
    it crashes, since the presumption is the old session will come down
    with it.
    
    This commit restarts "display server" applications on anything but
    wayland, because they can't actually be a display server in other
    cases.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760332

 gnome-session/gsm-manager.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 3052989..298253e 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -605,6 +605,12 @@ is_app_display_server (GsmManager *manager,
 {
         GsmManagerPhase phase;
 
+        /* Apps can only really act as a display server if
+         * we're a wayland session.
+         */
+        if (g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") != 0)
+                return FALSE;
+
         phase = gsm_app_peek_phase (app);
 
         return (phase == GSM_MANAGER_PHASE_DISPLAY_SERVER &&