*** ubiquity-hooks/30accessibility.old	2010-09-29 07:03:03.534777001 +0000
--- ubiquity-hooks/30accessibility	2010-09-29 07:10:50.986777001 +0000
*************** for x in $(cat /proc/cmdline); do
*** 83,89 ****
  
  			if [ -x /target/usr/bin/orca ]; then
  				if [ -f /home/$USERNAME/.local/share/orca/user-settings.py ]; then
! 					cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
  				else
  					mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
--- 83,90 ----
  
  			if [ -x /target/usr/bin/orca ]; then
  				if [ -f /home/$USERNAME/.local/share/orca/user-settings.py ]; then
! 					mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/.local/share
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
  				else
  					mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
*************** for x in $(cat /proc/cmdline); do
*** 113,121 ****
                          add_sudoers_file
  			if [ -x /target/usr/bin/orca ]; then
  				if [ -f /home/$USERNAME/.local/share/orca/user-settings.py ]; then
! 					cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/var/lib/gdm
  					chroot /target chown -R gdm.gdm /var/lib/gdm/.local/share/orca
  				else
  					mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
--- 114,124 ----
                          add_sudoers_file
  			if [ -x /target/usr/bin/orca ]; then
  				if [ -f /home/$USERNAME/.local/share/orca/user-settings.py ]; then
! 					mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
! 					mkdir -p /target/var/lib/gdm/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/.local/share
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/var/lib/gdm/.local/share
  					chroot /target chown -R gdm.gdm /var/lib/gdm/.local/share/orca
  				else
  					mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
*************** for x in $(cat /proc/cmdline); do
*** 134,150 ****
                          gct -s -t string /desktop/gnome/applications/at/visual/exec orca
                          if [ -x /target/usr/bin/orca ]; then
  				if [ -f /home/$USERNAME/.local/share/orca/user-settings.py ]; then
! 					cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/var/lib/gdm
  					chroot /target chown -R gdm.gdm /var/lib/gdm/.local/share/orca
  				else
  	                                mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
  					echo "import orca.settings" >> /target/home/$TARGET_USERNAME/.local/share/orca/user-settings.py
  	                                echo "orca.settings.enableSpeech = False" >> /target/home/$TARGET_USERNAME/.local/share/orca/user-settings.py
  	                                echo "orca.settings.enableBraille = True" >> /target/home/$TARGET_USERNAME/.local/share/orca/user-settings.py
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$TARGET_USERNAME/.local/share/orca /target/var/lib/gdm
  					chroot /target chown -R gdm.gdm /var/lib/gdm/.local/share/orca
  				fi
                          fi
--- 137,156 ----
                          gct -s -t string /desktop/gnome/applications/at/visual/exec orca
                          if [ -x /target/usr/bin/orca ]; then
  				if [ -f /home/$USERNAME/.local/share/orca/user-settings.py ]; then
! 	                                mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
! 					mkdir -p /target/var/lib/gdm/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/.local/share
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$USERNAME/.local/share/orca /target/var/lib/gdm/.local/share
  					chroot /target chown -R gdm.gdm /var/lib/gdm/.local/share/orca
  				else
  	                                mkdir -p /target/home/$TARGET_USERNAME/.local/share/orca
+ 					mkdir -p /var/lib/gdm/.local/share/orca
  					echo "import orca.settings" >> /target/home/$TARGET_USERNAME/.local/share/orca/user-settings.py
  	                                echo "orca.settings.enableSpeech = False" >> /target/home/$TARGET_USERNAME/.local/share/orca/user-settings.py
  	                                echo "orca.settings.enableBraille = True" >> /target/home/$TARGET_USERNAME/.local/share/orca/user-settings.py
  					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
! 					cp -r /home/$TARGET_USERNAME/.local/share/orca /target/var/lib/gdm/.local/share/orca
  					chroot /target chown -R gdm.gdm /var/lib/gdm/.local/share/orca
  				fi
                          fi