Merging casper 1.157.

2 files changed, 38 insertions, 0 deletions

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 079bcd5..31d5e92 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,20 @@
+casper (1.157) jaunty; urgency=low
+
+  [ Emmet Hikory ]
+  * 10adduser: add Category=Favorites support for netbook-launcher
+    (LP: #334656)
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Remove the fast user switch applet from the top panel, to re-enable
+      the logout/shutdown menu options in the system menu. This is done for
+      the speech and braille accessibility profiles. Requiring several
+      keyboard shortcuts to access something that is not entirely accessible
+      yet only makes things difficult for blind/vision impaired users, and is
+      likely to cause much confusion if sed menu entries are not present.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Tue, 03 Mar 2009 15:49:21 +1100
+
 casper (1.156) jaunty; urgency=low
 
   * scripts/casper-bottom/30accessibility &
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 51780d2..3ff3fda 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -56,6 +56,24 @@ laptop_detect ()
 	fi
 }
 
+remove_applet ()
+{
+	# Code to remove an applet from the default panel setup
+	# This is rather hacky, but I can't think of a one or two line regular
+	# expression to do this any more efficiently. Patches welcome. In
+	# addition, setting these via gconf also doesn't work for some reason.
+
+	local line_no prior_line next_line
+
+	line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+	prior_line="$((line_no-1))"
+	next_line="$((line_no+1))"
+
+	sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
+
+	chroot /root update-gconf-defaults
+}
+
 case ${ACCESS} in
 	access=v1)
 		# Lesser Visual Impairment
@@ -102,6 +120,7 @@ case ${ACCESS} in
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
+		remove_applet fast_user_switch
 		;;
 
 	braille=ask)
@@ -121,6 +140,8 @@ case ${ACCESS} in
 			laptop_detect
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
+
+		remove_applet fast_user_switch
 		;;
 
 	access=m1)