X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=7753154489a74199680c092673571c9c7f921bbd;hb=9c7e05ec599f1cae40b240c4e49a5cfe86b7de5d;hp=314496dd5cc514a29417823ed1887cc49b02bdd3;hpb=cafc3175ce0d72a3f78160194d293be85f7c1d56;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 314496d..7753154 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -27,7 +27,7 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring accessibility options..."
+log_begin_msg "Configuring accessibility options"
 
 # live-initramfs script
 
@@ -67,8 +67,10 @@ case ${ACCESS} in
 		if type orca > /dev/null 2>&1
 		then
 			mkdir -p /root/home/${USERNAME}/.orca
-			echo "orca.settings.enableSpeech = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
-			echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+			echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
+			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
 		fi
 		;;
 
@@ -79,6 +81,7 @@ case ${ACCESS} in
 		gct -s -t bool /desktop/gnome/interface/accessibility true
 		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
 		gct -s -t bool /apps/gksu/disable-grab true
+		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 		;;
 
 	braille=ask)
@@ -86,12 +89,15 @@ case ${ACCESS} in
 		gct -s -t bool /desktop/gnome/interface/accessibility true
 		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
 		gct -s -t bool /apps/gksu/disable-grab true
+		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
 		if type orca > /dev/null 2>&1
 		then
 			mkdir -p /root/home/${USERNAME}/.orca
-			echo "orca.settings.enableSpeech = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
-			echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+			echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
+			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
 		fi
 		;;