Merge lp:~mterry/unity-greeter/screen-reader into lp:unity-greeter

[Michael Terry]

Launch orca when users asks for it (without any windows popping up)

[Robert Ancell (robert-ancell)]

Committed with brace and comment style fixes

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-12-09 18:06:18 +0000
+++ src/user-list.vala	2012-01-09 10:14:23 +0000
@@ -569,6 +569,12 @@
 
     private void keyboard_toggled_cb (Gtk.CheckMenuItem item)
     {
+        // FIXME: The below would be sufficient if gnome-session were running
+        // to notice and run a screen keyboard in /etc/xdg/autostart...  But
+        // since we're not running gnome-session, we hardcode onboard here.
+        //var settings = new Settings ("org.gnome.desktop.a11y.applications");
+        //settings.set_boolean ("screen-keyboard-enabled", item.active);
+
         if (keyboard_window == null)
         {
             int id;
@@ -646,10 +652,19 @@
 
     private void screen_reader_toggled_cb (Gtk.CheckMenuItem item)
     {
-        var settings = new Settings ("org.gnome.desktop.a11y.applications");
-        settings.set_boolean ("screen-reader-enabled", item.active);
-        settings = new Settings ("org.gnome.desktop.interface");
-        settings.set_boolean ("toolkit-accessibility", item.active);
+        // FIXME: The below would be sufficient if gnome-session were running
+        // to notice and run a screen reader in /etc/xdg/autostart...  But
+        // since we're not running gnome-session, we hardcode orca here.
+        //var settings = new Settings ("org.gnome.desktop.a11y.applications");
+        //settings.set_boolean ("screen-reader-enabled", item.active);
+
+        // Hardcoded orca:
+        if (item.active) {
+            Process.spawn_command_line_async ("orca --replace --no-setup --disable=splash-window --disable=main-window");
+        }
+        else {
+            Process.spawn_command_line_async ("orca --quit");
+        }
     }
 
     public void show_message (string text, bool error = false)