From 24299455682875f2c7f5e38a5bb6a1901b9056c3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 11 Nov 2008 18:17:00 +0100
Subject: [PATCH] Merging casper 1.149.

---
 docs/ChangeLog.casper               | 14 +++++++++++++-
 scripts/live-bottom/30accessibility | 20 ++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index e15c933..6219742 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,9 +1,21 @@
+casper (1.149) intrepid; urgency=low
+
+  * scripts/casper-bottom/30accessibility &
+    ubiquity-hooks/30accessibility:
+    - Revert to using gconf keys for starting orca, as this is now what
+      orca does when the user chooses to automatically start orca from Orca's
+      preferences window.
+    - Explicitly set orca as the program to start up for magnification,
+      speech, and braille.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Thu, 16 Oct 2008 11:33:02 +1100
+
 casper (1.148) intrepid; urgency=low
 
   * Skip remounting read-only in try_mount as it's unnecessary and
     breaks persistence.  Thanks James Westby (LP: #274076).
 
- -- Evan Dandrea <evand@ubuntu.com>  Wed, 15 Oct 2008 13:13:38 -0400
+ -- Evan Dandrea <evand@ubuntu.com>  Wed, 15 Oct 2008 13:09:57 -0400
 
 casper (1.147) intrepid; urgency=low
 
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index d838d76..3f88e2f 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -67,6 +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 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
 
@@ -77,10 +79,6 @@ 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
 		;;
 
@@ -89,20 +87,18 @@ 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 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
 
-		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 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
 
@@ -113,10 +109,6 @@ 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
 		;;