gdm r6694 - in branches/gnome-2-20: . config

[bcameron svn gnome org]

Author: bcameron
Date: Wed Feb 11 21:49:43 2009
New Revision: 6694
URL: http://svn.gnome.org/viewvc/gdm?rev=6694&view=rev

Log:
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.
        * config/Xsession.solaris, config/Xsession.common: Removed.


Removed:
   branches/gnome-2-20/config/Xsession.common
   branches/gnome-2-20/config/Xsession.solaris
Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/config/Makefile.am
   branches/gnome-2-20/config/Xsession.in

Modified: branches/gnome-2-20/config/Makefile.am
==============================================================================
--- branches/gnome-2-20/config/Makefile.am	(original)
+++ branches/gnome-2-20/config/Makefile.am	Wed Feb 11 21:49:43 2009
@@ -24,8 +24,6 @@
 	CDE.desktop.in \
 	ssh.desktop.in.in \
 	Xsession.in \
-	Xsession.common \
-	Xsession.solaris \
 	gdm \
 	gdm-autologin \
 	locale.alias \
@@ -40,17 +38,9 @@
 
 CLEANFILES = Xsession gdm.conf gdm.conf-custom default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist
 
-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[@],Distro configuration section,g' \
 		<$(srcdir)/Xsession.in >Xsession
 
 gdm.conf: $(srcdir)/gdm.conf.in

Modified: branches/gnome-2-20/config/Xsession.in
==============================================================================
--- branches/gnome-2-20/config/Xsession.in	(original)
+++ branches/gnome-2-20/config/Xsession.in	Wed Feb 11 21:49:43 2009
@@ -186,24 +186,6 @@
     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"