diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-10-26 13:14:31 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:06 +0100 |
| commit | 9a4b1e916f10c04e516b4801ea7a7995d6ddcc11 (patch) | |
| tree | 396551e7bf774d5fea87fa3f39f2780bc08cb693 | |
| parent | 5020118e6c6744ef26f01dab015295c7baadecaa (diff) | |
| download | live-boot-9a4b1e916f10c04e516b4801ea7a7995d6ddcc11.tar.gz live-boot-9a4b1e916f10c04e516b4801ea7a7995d6ddcc11.zip | |
Merging casper 1.158.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/30accessibility | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 31d5e92..d604bc5 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.158) jaunty; urgency=low + + * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility: + - use laptop_detect function in blindness profile as well + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 09 Mar 2009 14:07:17 +1100 + casper (1.157) jaunty; urgency=low [ Emmet Hikory ] diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index 3ff3fda..90312f6 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -49,10 +49,14 @@ gct () laptop_detect () { - if chroot /root /usr/sbin/laptop-detect + if [ -x /root/usr/bin/orca ] 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 + if chroot /root /usr/sbin/laptop-detect + then + mkdir -p /root/home/$USERNAME/.orca + 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 fi } @@ -121,6 +125,7 @@ case ${ACCESS} in gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity remove_applet fast_user_switch + laptop_detect ;; braille=ask) |