Merging casper 1.156.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 9e21ee0..079bcd5 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.156) jaunty; urgency=low
+
+  * scripts/casper-bottom/30accessibility &
+    ubiquity-hooks/30accessibility:
+    - If using a laptop, enable the laptop keyboard layout
+    - There is no longer a need to set gconf values as root in only-ubiquity
+      mode
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 06 Feb 2009 08:59:52 +0100
+
 casper (1.155) jaunty; urgency=low
 
   [ Colin Watson ]

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3f88e2f..51780d2 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,6 +47,15 @@ gct ()
        fi
 }
 
+laptop_detect ()
+{
+       if chroot /root /usr/sbin/laptop-detect
+       then
+               echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
+               echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+       fi
+}
+
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
@@ -78,6 +87,7 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;
@@ -108,6 +118,7 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;