X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=75bfae497ec88cb5f43f69446ca0a80d804e8d41;hb=c967ebfc4e43fb16a0c2c140c66900712be95ab7;hp=ba9c23d2b4c416d0d5233231e3b86e763bbc3819;hpb=f1d90cde9113d2fc012b7234e698e88e4e3ecfc3;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index ba9c23d..75bfae4 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,19 +47,6 @@ gct ()
 	fi
 }
 
-laptop_detect ()
-{
-	if [ -x /root/usr/bin/orca ]
-	then
-		if chroot /root /usr/sbin/laptop-detect
-		then
-			mkdir -p /root/home/$USERNAME/.orca
-			echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
-			echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
-		fi
-	fi
-}
-
 remove_applet ()
 {
 	# Code to remove an applet from the default panel setup
@@ -70,6 +57,7 @@ remove_applet ()
 	local line_no prior_line next_line
 
 	line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+	[ "$line_no" ] || return
 	prior_line="$((line_no-1))"
 	next_line="$((line_no+1))"
 
@@ -110,7 +98,6 @@ case ${ACCESS} in
 			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
-			laptop_detect
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
 		;;
@@ -122,16 +109,17 @@ 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 string /desktop/gnome/applications/at/visual/exec orca
+		gct -s -t string /apps/empathy/conversation/theme classic
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		remove_applet fast_user_switch
-		laptop_detect
-		touch /root/etc/pulse/a11y_nostart
-		sed -i -e 's/autospawn = yes/autospawn = no/g' /root/etc/pulse/client.conf
-		mkdir -p /root/home/$USERNAME/.orca
-		chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
+		if [ -x /root/usr/bin/orca ]
+		then
+			mkdir -p /root/home/$USERNAME/.orca
+			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
+		fi
 		;;
 
 	braille=ask)
@@ -141,6 +129,7 @@ case ${ACCESS} in
 		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
+		gct -s -t string /apps/empathy/conversation/theme classic
 		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]