Merging casper 1.117.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index b440737..ea43f07 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,12 @@
+casper (1.117) hardy; urgency=low
+
+  * Disable speech for magnifier and braille profiles again.  Thanks
+    Luke Yelavich.
+  * esd is enabled by default, so the comment in 30accessibility is no
+    longer relevant.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Wed, 13 Feb 2008 01:20:22 -0500
+
 casper (1.116) hardy; urgency=low
 
   * Fix setting orca options in 30accessibility.

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 314496d..eaf3a50 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -67,7 +67,7 @@ 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.enableSpeech = False" >> /root/home/${USERNAME}/.orca/orca-customizations.py
                        echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
                fi
                ;;
@@ -90,7 +90,7 @@ 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.enableSpeech = False" >> /root/home/${USERNAME}/.orca/orca-customizations.py
                        echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
                fi
                ;;