Merging casper 1.216.

[live-boot-grml.git] / scripts / live-bottom / 30accessibility

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3c51fa0..75bfae4 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -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
                ;;