diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2008-12-08 23:48:54 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2008-12-08 23:48:54 +0000 |
| commit | 6b874bcce04e8443514491f11f6f75186bc66823 (patch) | |
| tree | 842996e9c89d1aeb97c7b79d20e98ffe5b5cbe0e | |
| parent | a98b1c8bd8366c4f5309b5a0265e6d3e0f8c41f3 (diff) | |
| download | gdm-6b874bcce04e8443514491f11f6f75186bc66823.tar.gz | |
Correct setting of VTE_CJK_WIDTH when on Solaris. Updated patch from Takao
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.
svn path=/branches/gnome-2-20/; revision=6627
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config/Xsession.solaris | 8 | ||||
| -rw-r--r-- | daemon/slave.c | 15 |
3 files changed, 27 insertions, 4 deletions
@@ -1,3 +1,11 @@ +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. + 2008-12-07 Brian Cameron <brian.cameron@sun.com> * config/Init.in: Fix underquoted strings, refer to bug #563550. diff --git a/config/Xsession.solaris b/config/Xsession.solaris index 68ba39cf..7315b769 100644 --- a/config/Xsession.solaris +++ b/config/Xsession.solaris @@ -20,8 +20,12 @@ export G_BROKEN_FILENAMES # 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 diff --git a/daemon/slave.c b/daemon/slave.c index 4ec19a40..7d4fffa6 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -2631,9 +2631,20 @@ gdm_slave_greeter (void) /* * 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); |