X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=ef83c72ba3cd01f5dd5f2c45884113d4b4e34ab7;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=3c51fa0362ec70745ffb42df11d1458139751894;hpb=705393cde8a537bb0a652d676949b9890c110d3a;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3c51fa0..ef83c72 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOACCESSIBILITY}" ]
 then
@@ -35,7 +35,7 @@ fi
 
 log_begin_msg "Configuring accessibility options"
 
-# live-initramfs script
+# live-boot script
 
 gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
 
@@ -57,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))"
 
@@ -108,19 +109,12 @@ 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
-		if [ -x /root/usr/bin/pulse-session ]
-		then
-			touch /root/home/$USERNAME/.pulse_a11y_nostart
-			chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.pulse_a11y_nostart
-			mkdir -p /root/home/$USERNAME/.pulse
-			echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
-			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
-		fi
 		if [ -x /root/usr/bin/orca ]
 		then
 			mkdir -p /root/home/$USERNAME/.orca
@@ -135,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 ]
@@ -147,15 +142,6 @@ case ${ACCESS} in
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
 
-		if [ -x /root/usr/bin/pulse-session ]
-		then
-			touch /root/home/$USERNAME/.pulse_a11y_nostart
-			chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.pulse_a11y_nostart
-			mkdir -p /root/home/$USERNAME/.pulse
-			echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
-			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
-		fi
-
 		remove_applet fast_user_switch
 		;;