From 3ebe9dded3869bee88babc71503b7834595667b7 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 4 Nov 2015 14:10:08 -0500
Subject: Xsession: get rid of "custom" session

custom is a magic name we used to allow
for having the user decide their session by
a ~/.xsession file.  We no longer support that
construct and haven't for many years. Instead,
users who want that functionality can just add
a xsession file to accomplish it.

This commit just removes some left over cruft that
never got cleaned up.
---
 common/gdm-common.h  |  2 --
 daemon/gdm-session.c | 13 -------------
 data/Xsession.in     |  9 ---------
 3 files changed, 24 deletions(-)

diff --git a/common/gdm-common.h b/common/gdm-common.h
index d0812ed3..8d83a124 100644
--- a/common/gdm-common.h
+++ b/common/gdm-common.h
@@ -31,8 +31,6 @@
                 expr;                \
         } while G_UNLIKELY (errno == EINTR);
 
-#define GDM_CUSTOM_SESSION  "custom"
-
 GQuark gdm_common_error_quark (void);
 #define GDM_COMMON_ERROR gdm_common_error_quark()
 
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 63fe1c1f..b3ff8ab3 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -466,19 +466,6 @@ get_session_command_for_name (const char *name,
         res = get_session_command_for_file (filename, command);
         g_free (filename);
 
-        /*
-         * The GDM Xsession script honors "custom" as a valid session.  If the
-         * session is one of these, no file is needed, then just run the
-         * command as "custom".
-         */
-        if (!res && strcmp (name, GDM_CUSTOM_SESSION) == 0) {
-                g_debug ("No custom desktop file, but accepting it anyway.");
-                if (command != NULL) {
-                        *command = g_strdup (GDM_CUSTOM_SESSION);
-                }
-                res = TRUE;
-        }
-
         return res;
 }
 
diff --git a/data/Xsession.in b/data/Xsession.in
index f2533753..9d79558c 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -157,15 +157,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     done
 fi
 
-if [ "x$command" = "xcustom" ] ; then
-  if [ -x "$HOME/.xsession" ]; then
-    command="$HOME/.xsession"
-  else
-    echo "$0: Cannot find ~/.xsession will try the default session"
-    command="default"
-  fi
-fi
-
 if [ "x$command" = "xdefault" ] ; then
   if [ -x "$HOME/.Xclients" ]; then
     command="$HOME/.Xclients"
-- 
cgit v1.2.1