[gdm: 36/70] config/Makefile.am, config/Xsession.common, config/Xsession.in Backout

[Ray Strode <halfline src gnome org>]

commit 5f18cc07802e4b3ce11d380f098496febf509738
Author: Brian Cameron <brian cameron sun com>
Date:   Wed Feb 11 21:56:27 2009 +0000

    config/Makefile.am, config/Xsession.common, config/Xsession.in Backout
    
    2009-02-11 Brian Cameron <brian cameron sun com>
    
            * config/Makefile.am, config/Xsession.common, config/Xsession.in
              Backout change for bug #509141.  This is no longer needed on
              Solaris since the code was reworked to make use of more
              general /etc/X11/xinit/xinitrc.d scripts.  Better to keep distro
              specific code out of the upstream GDM.  Fixes bug #571319.  Patch by
              Takao Fujiwara <Takao Fujiwara sun com>.
            * config/Xsession.solaris, config/Xsession.common: Removed.
    
    svn path=/trunk/; revision=6696
---
 ChangeLog             |   10 ++++++++++
 data/Makefile.am      |   10 ----------
 data/Xsession.common  |    1 -
 data/Xsession.in      |   18 ------------------
 data/Xsession.solaris |   34 ----------------------------------
 5 files changed, 10 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 812d2eb..8dfbf98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-02-11 Brian Cameron <brian cameron sun com>
+
+	* config/Makefile.am, config/Xsession.common, config/Xsession.in
+	  Backout change for bug #509141.  This is no longer needed on
+	  Solaris since the code was reworked to make use of more
+	  general /etc/X11/xinit/xinitrc.d scripts.  Better to keep distro
+	  specific code out of the upstream GDM.  Fixes bug #571319.  Patch by
+	  Takao Fujiwara <Takao Fujiwara sun com>.
+	* config/Xsession.solaris, config/Xsession.common: Removed.
+
 2009-02-11  Ray Strode  <rstrode redhat com>
 
 	* gui/simple-greeter/gdm-language-option-widget.c
diff --git a/data/Makefile.am b/data/Makefile.am
index e916c12..a317fdd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,17 +14,9 @@ postlogindir = $(gdmconfdir)/PostLogin
 workingdir = $(GDM_WORKING_DIR)
 xauthdir = $(GDM_XAUTH_DIR)
 
-if OS_SOLARIS
-   DISTRO_XSESSION=$(srcdir)/Xsession.solaris
-else
-   DISTRO_XSESSION=$(srcdir)/Xsession.common
-endif
-
 Xsession: $(srcdir)/Xsession.in
 	sed	-e 's,[ ]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
 		-e 's,[ ]libexecdir[@],$(libexecdir),g' \
-		-e '/^# @DISTRO_XSESSION@/r $(DISTRO_XSESSION)' \
-		-e 's,[ ]DISTRO_XSESSION[@],Distribution configuration section,g' \
 		<$(srcdir)/Xsession.in >Xsession
 
 Init: $(srcdir)/Init.in
@@ -88,8 +80,6 @@ EXTRA_DIST =			\
 	gdm.schemas.in.in	\
 	gdm.conf-custom.in 	\
 	Xsession.in 		\
-	Xsession.common		\
-	Xsession.solaris	\
 	gdm 			\
 	gdm-autologin 		\
 	Init.in 		\
diff --git a/data/Xsession.common b/data/Xsession.common
deleted file mode 100644
index a2db2c4..0000000
--- a/data/Xsession.common
+++ /dev/null
@@ -1 +0,0 @@
-# There is no special configuration for this distro.
diff --git a/data/Xsession.in b/data/Xsession.in
index 7d69384..0ae3b31 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -186,24 +186,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     done
 fi
 
-# @DISTRO_XSESSION@
-#
-# End of Distribution configuration section.
-#
-
-#Startup Input methods (IIIM->XIM)
-if [ -f /etc/iiim/xsession ]; then
-	. /etc/iiim/xsession
-fi
-#Startup XIM stuff
-if [ "x$XMODIFIERS" = "x" ]; then
- if [ -f "$HOME/.xim" ]; then
-	. $HOME/.xim
- elif [ -f "/etc/skel/.xim" ]; then
-	. /etc/skel/.xim
- fi
-fi
-
 if [ "x$command" = "xcustom" ] ; then
   if [ -x "$HOME/.xsession" ]; then
     command="$HOME/.xsession"
diff --git a/data/Xsession.solaris b/data/Xsession.solaris
deleted file mode 100644
index 68ba39c..0000000
--- a/data/Xsession.solaris
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# To determine the character set used for filenames with
-# glib's g_filename_to/from_utf8() functions, we set the
-# environment variables G_FILENAME_ENCODING and G_BROKEN_FILENAMES.
-#
-# G_BROKEN_FILENAMES, when set, lets the functions take the 
-# character set for the current locale for filename's encoding.
-#
-# G_FILENAME_ENCODING, which is introduced to glib 2.3.x and later, may be
-# set to a comma-separated list of character set names.
-# The special token "@locale" is taken to mean the character set 
-# for the current locale. The first character set from the list is taken 
-# as the filename encoding. 
-#
-# If G_FILENAME_ENCODING is not set, but G_BROKEN_FILENAMES is, the
-# character set of the current locale is taken as the filename encoding.
-
-G_BROKEN_FILENAMES=yes
-export G_BROKEN_FILENAMES
-# G_FILENAME_ENCODING= locale
-# export G_FILENAME_ENCODING
-
-VTE_CJK_WIDTH=1
-export VTE_CJK_WIDTH
-
-if [ "x$LANG" = "xzh" ] ; then
-  export LANGUAGE=zh:zh_CN.EUC
-fi
-
-#Startup Input methods (SCIM->XIM)
-if [ -f /etc/scim/xsession ]; then
-       . /etc/scim/xsession
-fi
-