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

[bcameron svn gnome org]

Author: bcameron
Date: Wed Apr 23 00:28:24 2008
New Revision: 6167
URL: http://svn.gnome.org/viewvc/gdm?rev=6167&view=rev

Log:
2008-04-22 Brian Cameron <brian cameron sun com>

        * configure.ac, config/Xsession.in, config/Xsession.solaris,
          config/Xsession.common, config/Makefile.am:  Fix the way
          Xsession is built so that distros can more easily add their
          own logic to the Xsession script.  Move Solaris specific
          Xsession logic to the Xsession.solaris file.  Get rid of
          logic to normalize LC_ variables since this was causing
          problems for some users, fixes bug #509141.


Added:
   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
   branches/gnome-2-20/configure.ac

Modified: branches/gnome-2-20/config/Makefile.am
==============================================================================
--- branches/gnome-2-20/config/Makefile.am	(original)
+++ branches/gnome-2-20/config/Makefile.am	Wed Apr 23 00:28:24 2008
@@ -24,6 +24,8 @@
 	CDE.desktop.in \
 	ssh.desktop.in.in \
 	Xsession.in \
+	Xsession.common \
+	Xsession.solaris \
 	gdm \
 	gdm-autologin \
 	locale.alias \
@@ -38,9 +40,17 @@
 
 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

Added: branches/gnome-2-20/config/Xsession.common
==============================================================================
--- (empty file)
+++ branches/gnome-2-20/config/Xsession.common	Wed Apr 23 00:28:24 2008
@@ -0,0 +1 @@
+# There are no common values between vendors.

Modified: branches/gnome-2-20/config/Xsession.in
==============================================================================
--- branches/gnome-2-20/config/Xsession.in	(original)
+++ branches/gnome-2-20/config/Xsession.in	Wed Apr 23 00:28:24 2008
@@ -177,14 +177,6 @@
   fi
 fi
 
-# Normalize all LC_* settings to $LANG
-for var in "LC_ALL" "LC_CTYPE" "LC_NUMERIC" "LC_TIME" "LC_COLLATE" "LC_MONETARY" "LC_MESSAGES" \
-	"LC_PAPER" "LC_NAME" "LC_ADDRESS" "LC_TELEPHONE" "LC_MEASUREMENT" "LC_IDENTIFICATION" ; do
-  if eval "[ -n \"\$$var\" -a \"\$$var\" != \"\$LANG\" ]" ; then
-    unset $var
-  fi
-done
-
 # run all system xinitrc shell scripts.
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
     for i in /etc/X11/xinit/xinitrc.d/* ; do
@@ -194,27 +186,10 @@
     done
 fi
 
+# @DISTRO_XSESSION@
 #
-# 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.
+# End of Distribution configuration section.
 #
-# 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
 
 #Startup Input methods (IIIM->XIM)
 if [ -f /etc/iiim/xsession ]; then

Added: branches/gnome-2-20/config/Xsession.solaris
==============================================================================
--- (empty file)
+++ branches/gnome-2-20/config/Xsession.solaris	Wed Apr 23 00:28:24 2008
@@ -0,0 +1,28 @@
+#
+# 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
+
+export VTE_CJK_WIDTH=1
+
+if [ "x$LANG" = "xzh" ] ; then
+  export LANGUAGE=zh:zh_CN.EUC
+fi
+

Modified: branches/gnome-2-20/configure.ac
==============================================================================
--- branches/gnome-2-20/configure.ac	(original)
+++ branches/gnome-2-20/configure.ac	Wed Apr 23 00:28:24 2008
@@ -1079,6 +1079,7 @@
 	HOST_UTMP_LINE_ATTACHED="/dev/dtlocal"
 	HOST_UTMP_LINE_REMOTE="/dev/dtremote"
 	HOST_UTMP_PSEUDO_DEVICE="true"
+	os_solaris=yes
 	;;
 *freebsd*)
 	HOST_GDM_USER_PATH="/bin:/usr/bin"
@@ -1319,6 +1320,8 @@
 
 # Set configuration choices.
 #
+AM_CONDITIONAL(OS_SOLARIS, test x$os_solaris = xyes)
+
 AC_SUBST(HALT_COMMAND)
 AC_DEFINE_UNQUOTED(HALT_COMMAND,"$HALT_COMMAND")
 AC_SUBST(REBOOT_COMMAND)