summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-11-11 17:49:49 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:02 +0100
commit51bcd807500eb90c674974023d5d7ed7bdb89e9f (patch)
tree76d32e811d6271f26ba88d4fe58b9fa44c037659
parenta204eb6a91ed48075af294f5a25d04643b5f6593 (diff)
downloadlive-boot-51bcd807500eb90c674974023d5d7ed7bdb89e9f.tar.gz
live-boot-51bcd807500eb90c674974023d5d7ed7bdb89e9f.zip
Merging casper 1.143.
-rw-r--r--docs/ChangeLog.casper10
-rwxr-xr-xscripts/live-bottom/30accessibility19
2 files changed, 26 insertions, 3 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index afa19e2..18a4fac 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.143) intrepid; urgency=low
+
+ * scripts/casper-bottom/30accessibility &
+ ubiquity-hooks/30accessibility: Change the way that orca is set to
+ automatically start. Orca can be started via a gconf key, however this
+ is not reflected in the orca UI, and doesn't easily allow the user to
+ prevent orca from autostarting on an installed system.
+
+ -- Luke Yelavich <themuso@ubuntu.com> Wed, 24 Sep 2008 10:37:35 +1000
+
casper (1.142) intrepid; urgency=low
* Fix syntax error introduced by is_nice_device regex fix.
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 2a91157..d838d76 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -67,8 +67,8 @@ case ${ACCESS} in
access=v2)
# Moderate Visual Impairment
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 [ -x /root/usr/bin/orca ]
then
@@ -77,6 +77,10 @@ case ${ACCESS} in
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
+
+ mkdir -p /root/home/${USERNAME}/.config/autostart
+ cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
+ chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
fi
;;
@@ -85,15 +89,20 @@ case ${ACCESS} in
# Disabled for now, until we know eSpeak works.
#gct -s -t bool /desktop/gnome/sound/enable_esd false
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 [ -x /root/usr/bin/orca ]
+ then
+ mkdir -p /root/home/${USERNAME}/.config/autostart
+ cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
+ chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
+ fi
;;
braille=ask)
# Braille
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
@@ -104,6 +113,10 @@ case ${ACCESS} in
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
+
+ mkdir -p /root/home/${USERNAME}/.config/autostart
+ cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
+ chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
fi
;;