gdm r6696 - in trunk: . data

[bcameron svn gnome org]

Author: bcameron
Date: Wed Feb 11 21:56:27 2009
New Revision: 6696
URL: http://svn.gnome.org/viewvc/gdm?rev=6696&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.  Fixes bug #571319.  Patch by
          Takao Fujiwara <Takao Fujiwara sun com>.
        * config/Xsession.solaris, config/Xsession.common: Removed.


Removed:
   trunk/data/Xsession.common
   trunk/data/Xsession.solaris
Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am
   trunk/data/Xsession.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Feb 11 21:56:27 2009
@@ -14,17 +14,9 @@
 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 @@
 	gdm.schemas.in.in	\
 	gdm.conf-custom.in 	\
 	Xsession.in 		\
-	Xsession.common		\
-	Xsession.solaris	\
 	gdm 			\
 	gdm-autologin 		\
 	Init.in 		\

Modified: trunk/data/Xsession.in
==============================================================================
--- trunk/data/Xsession.in	(original)
+++ trunk/data/Xsession.in	Wed Feb 11 21:56:27 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"