X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=3f88e2f0005e56c325cf8c0da9ca02124bf418b5;hb=87442bce08be1da345a90026f64b66df5f41ccc8;hp=d838d76898b54ef4acaeecaca4db60b29069fa31;hpb=51bcd807500eb90c674974023d5d7ed7bdb89e9f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index d838d76..3f88e2f 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -67,6 +67,8 @@ case ${ACCESS} in
 	access=v2)
 		# Moderate Visual Impairment
 		gct -s -t bool /desktop/gnome/interface/accessibility true
+		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
@@ -77,10 +79,6 @@ case ${ACCESS} in
 			echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
 			echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
-
-			mkdir -p /root/home/${USERNAME}/.config/autostart
-			cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-			chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
 		fi
 		;;
 
@@ -89,20 +87,18 @@ case ${ACCESS} in
 		# Disabled for now, until we know eSpeak works.
 		#gct -s -t bool /desktop/gnome/sound/enable_esd false
 		gct -s -t bool /desktop/gnome/interface/accessibility true
+		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
-		if [ -x /root/usr/bin/orca ]
-		then
-			mkdir -p /root/home/${USERNAME}/.config/autostart
-			cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-			chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
-		fi
 		;;
 
 	braille=ask)
 		# Braille
 		gct -s -t bool /desktop/gnome/interface/accessibility true
+		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
@@ -113,10 +109,6 @@ case ${ACCESS} in
 			echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
 			echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
-
-			mkdir -p /root/home/${USERNAME}/.config/autostart
-			cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-			chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
 		fi
 		;;