gdm r6627 - in branches/gnome-2-20: . config daemon

[bcameron svn gnome org]

Author: bcameron
Date: Mon Dec  8 23:48:54 2008
New Revision: 6627
URL: http://svn.gnome.org/viewvc/gdm?rev=6627&view=rev

Log:
2008-12-08 Brian Cameron <brian cameron sun com>

        * daemon/slave.c: Correct setting of VTE_CJK_WIDTH when on Solaris.
          Updated patch from Takao Fujiwara <Takao Fujiwara sun com>.
        * daemon/slave.c: Fix how GDM sets ACL's on Solaris so it also works
          with ZFS filesystems.  Now only set ACL's when a11y is turned on,
          since they are not needed otherwise.


Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/config/Xsession.solaris
   branches/gnome-2-20/daemon/slave.c

Modified: branches/gnome-2-20/config/Xsession.solaris
==============================================================================
--- branches/gnome-2-20/config/Xsession.solaris	(original)
+++ branches/gnome-2-20/config/Xsession.solaris	Mon Dec  8 23:48:54 2008
@@ -20,8 +20,12 @@
 # G_FILENAME_ENCODING= locale
 # export G_FILENAME_ENCODING
 
-VTE_CJK_WIDTH=1
-export VTE_CJK_WIDTH
+case $LANG in
+ja*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
+ko*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
+zh*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
+*) ;;
+esac
 
 if [ "x$LANG" = "xzh" ] ; then
   export LANGUAGE=zh:zh_CN.EUC

Modified: branches/gnome-2-20/daemon/slave.c
==============================================================================
--- branches/gnome-2-20/daemon/slave.c	(original)
+++ branches/gnome-2-20/daemon/slave.c	Mon Dec  8 23:48:54 2008
@@ -2631,9 +2631,20 @@
 	/*
 	 * Set access control for audio device so that GDM owned programs can
 	 * play audio and work with accessibility programs that require audio.
+	 * This is only needed if a11y is turned on.
 	 */
-	system ("/usr/bin/setfacl -m user:gdm:rwx,mask:rwx /dev/audio");
-	system ("/usr/bin/setfacl -m user:gdm:rwx,mask:rwx /dev/audioctl");
+	if (gdm_daemon_config_get_value_bool (GDM_KEY_ADD_GTK_MODULES)) {
+		int acl_flavor;
+		acl_flavor = pathconf("/dev/audio", _PC_ACL_ENABLED);
+
+		if (acl_flavor & _ACL_ACLENT_ENABLED) {
+			system ("/usr/bin/setfacl -m user:gdm:rwx,mask:rwx /dev/audio");
+			system ("/usr/bin/setfacl -m user:gdm:rwx,mask:rwx /dev/audioctl");
+		} else if (acl_flavor & _ACL_ACE_ENABLED) {
+			system ("chmod A+user:gdm:rwx:allow /dev/audio");
+			system ("chmod A+user:gdm:rwx:allow /dev/audioctl");
+		}
+	}
 #endif
 	gdm_debug ("Forking greeter process: %s", command);