20788N/A--- gdm-2.30.0/data/Xsession.in-orig 2010-04-07 15:12:25.882247407 -0500

20788N/A+++ gdm-2.30.0/data/Xsession.in 2010-04-07 15:12:57.139892497 -0500

20788N/A@@ -70,6 +70,30 @@ gdmwhich () {

20788N/A echo "$OUTPUT"

20788N/A }

20788N/A

20788N/A+# Reload audio settings after sourcing the user's .profile to ensure that any

20788N/A+# AUDIODEV settings defined by the user are honored.

20788N/A+#

20788N/A+AUDIOCTL_SAVE_HOSTNAME=`/usr/bin/hostname`

20788N/A+AUDIOCTL_SAVE_DEVICE=""

20788N/A+AUDIOCTL_SAVE_DIR="$HOME/.audioctl"

20788N/A+AUDIOCTL_DEVICE_OWNER=`/usr/bin/stat -L /dev/audio -c %U`

20788N/A+

20788N/A+# Only set audio settings if logindevperm has set the owner of the audio

20788N/A+# device to this user.

20788N/A+#

20788N/A+if test "x$USER" = "x$AUDIOCTL_DEVICE_OWNER" ; then

20788N/A+ if test -x "/usr/bin/audioctl" ; then

20788N/A+ AUDIOCTL_SAVE_DEVICE=`/usr/bin/audioctl show-device | /usr/bin/awk '/^ *Name /{ print $3; }'`

20788N/A+ fi

20788N/A+

20788N/A+ if test -n "$AUDIOCTL_SAVE_HOSTNAME" -a -n "$AUDIOCTL_SAVE_DEVICE"; then

20788N/A+ AUDIOCTL_SAVE_FILE="$AUDIOCTL_SAVE_DIR/audioctl-$AUDIOCTL_SAVE_HOSTNAME-$AUDIOCTL_SAVE_DEVICE"

20788N/A+ if test -f "$AUDIOCTL_SAVE_FILE" ; then

20788N/A+ /usr/bin/audioctl load-controls $AUDIOCTL_SAVE_FILE

20788N/A+ fi

20788N/A+ fi

20788N/A+fi

20788N/A+

20788N/A zenity=`gdmwhich zenity`

20788N/A

20788N/A # Note: ~/.xsession-errors is now done in the daemon so that it

20788N/A--- gdm-2.30.0/data/PostSession.in-orig 2010-04-07 15:11:36.882431156 -0500

20788N/A+++ gdm-2.30.0/data/PostSession.in 2010-04-07 15:13:18.268798760 -0500

20788N/A@@ -1,4 +1,31 @@

20788N/A #!/bin/sh

20788N/A PATH="@SCRIPT_PATH@"

20788N/A

20788N/A+AUDIOCTL_SAVE_HOSTNAME=`/usr/bin/hostname`

20788N/A+AUDIOCTL_SAVE_DIR="$HOME/.audioctl"

20788N/A+AUDIOCTL_SAVE_DEVICE=""

20788N/A+AUDIOCTL_DEVICE_OWNER=`/usr/bin/stat -L /dev/audio -c %U`

20788N/A+

20788N/A+# Only set audio settings if logindevperm has set the owner of the audio device

20788N/A+# to this user.

20788N/A+#

20788N/A+if test "x$USER" = "x$AUDIOCTL_DEVICE_OWNER" ; then

20788N/A+ if test -x "/usr/bin/audioctl" ; then

20788N/A+ AUDIOCTL_SAVE_DEVICE=`/usr/bin/audioctl show-device | /usr/bin/awk '/^ *Name /{ print $3; }'`

20788N/A+ fi

20788N/A+

20788N/A+ if test -n "$AUDIOCTL_SAVE_HOSTNAME" -a -n "$AUDIOCTL_SAVE_DEVICE"; then

20788N/A+ if test ! -d "$AUDIOCTL_SAVE_DIR" ; then

20788N/A+ /usr/bin/su "$USER" -c "/usr/bin/mkdir $AUDIOCTL_SAVE_DIR"

20788N/A+ /usr/bin/chmod 700 $AUDIOCTL_SAVE_DIR

20788N/A+ fi

20788N/A+

20788N/A+ if test -d "$AUDIOCTL_SAVE_DIR" ; then

20788N/A+ AUDIOCTL_SAVE_FILE="$AUDIOCTL_SAVE_DIR/audioctl-$AUDIOCTL_SAVE_HOSTNAME-$AUDIOCTL_SAVE_DEVICE"

20788N/A+ /usr/bin/su "$USER" -c "/usr/bin/audioctl save-controls -f $AUDIOCTL_SAVE_FILE"

20788N/A+ /usr/bin/chmod 600 $AUDIOCTL_SAVE_FILE

20788N/A+ fi

20788N/A+ fi

20788N/A+fi

20788N/A+

20788N/A exit 0