Merge lp:~arky/ubuntu/maverick/casper/fixes-621561 into lp:ubuntu/maverick/casper

[arky]

Fixes bug 621561

[Colin Watson (cjwatson)]

Thanks for your patch! I've resubmitted your merge against the natty branch, since this probably doesn't qualify for a stable release update but should be fine for merging into the development release.

Unmerged revisions

829. By arky on 2010-08-21

Add universal access preferences to taskbar

=== modified file 'scripts/casper-bottom/30accessibility'
--- scripts/casper-bottom/30accessibility	2010-08-11 00:49:25 +0000
+++ scripts/casper-bottom/30accessibility	2010-08-21 05:35:53 +0000
@@ -76,6 +76,7 @@
                         gct -s -t string /desktop/gnome/background/color_shading_type solid
                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
 
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
                         if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
@@ -96,6 +97,7 @@
 			fi
                         gct -s -t bool /apps/gksu/disable-grab true
                         gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         add_sudoers_file
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
                         ;;
@@ -106,7 +108,8 @@
                         gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
                         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 string /apps/empathy/conversation/theme classic                        
+                        gct -s -t string /apps/empathy/conversation/theme classic
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         remove_applet fast_user_switch
                         add_sudoers_file
 			if [ -x /root/usr/bin/orca ]; then
@@ -119,6 +122,7 @@
                         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 /desktop/gnome/accessibility/keyboard/enable true
 			if [ -x /root/usr/bin/orca ]; then
 				mkdir -p /root/home/$USERNAME/.orca
 				echo "import orca.settings" >> /root/home/$USERNAME/.orca/user-settings.py
@@ -143,6 +147,7 @@
                         gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
                         gct -s -t bool /apps/gksu/disable-grab true
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
                         if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
                             sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
@@ -157,7 +162,7 @@
                         gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
                         gct -s -t bool /desktop/gnome/applications/at/mobility/startup true
                         gct -s -t string /desktop/gnome/applications/at/mobility/exec onboard
-
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
                         if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
                             sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
 
=== modified file 'ubiquity-hooks/30accessibility'
--- ubiquity-hooks/30accessibility	2010-08-11 00:49:25 +0000
+++ ubiquity-hooks/30accessibility	2010-08-21 05:35:53 +0000
@@ -64,6 +64,7 @@
                         gct -s -t string /desktop/gnome/background/color_shading_type solid
                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
                         if [ -d /target/usr/share/xubuntu-default-settings/accessibility ]; then
                             cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
@@ -76,6 +77,7 @@
                         gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
                         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 /desktop/gnome/accessibility/keyboard/enable true
 
                         if [ -d /usr/share/xubuntu-default-settings ]; then
                           apt-install gnome-orca gnome-mag
@@ -109,6 +111,7 @@
                         gct_gdm -s -t bool /desktop/gnome/applications/at/visual/startup true
                         gct_gdm -s -t string /desktop/gnome/applications/at/visual/exec orca 
                         gct_gdm -s -t bool /desktop/gnome/applications/at/screen_reader_enabled true
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         remove_applet fast_user_switch
                         add_sudoers_file
 			if [ -x /target/usr/bin/orca ]; then
@@ -155,6 +158,7 @@
                         gct_gdm -s -t bool /desktop/gnome/applications/at/visual/startup true
                         gct_gdm -s -t string /desktop/gnome/applications/at/visual/exec orca 
                         gct_gdm -s -t bool /desktop/gnome/applications/at/screen_reader_enabled true
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         remove_applet fast_user_switch
                         add_sudoers_file
                         ;;
@@ -168,6 +172,7 @@
                         gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
                         gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         gct -s -t bool /apps/gksu/disable-grab true
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
                         if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
@@ -183,6 +188,7 @@
                         gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
                         gct -s -t bool /desktop/gnome/applications/at/mobility/startup true
                         gct -s -t string /desktop/gnome/applications/at/mobility/exec onboard
+			gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
                         if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
                             sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml