Merge lp:~mterry/unity-greeter/close-orca into lp:unity-greeter

[Michael Terry]

During quantal, orca dropped the --quit argument. So without this patch, we actually launch orca a second time when the user tries to stop the screen reader (with splash and main window and everything). Very bad experience.

[Robert Ancell (robert-ancell)]

I for one am opposed to "very bad experiences". So I support this patch!

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2012-10-03 14:30:19 +0000
+++ src/menubar.vala	2012-10-08 16:26:20 +0000
@@ -132,6 +132,7 @@
     private Gtk.CheckMenuItem high_contrast_item;
     private Gtk.Label keyboard_label = null;
     private Pid keyboard_pid = 0;
+    private Pid reader_pid = 0;
     private Gtk.CheckMenuItem onscreen_keyboard_item;
 
     construct
@@ -170,15 +171,21 @@
         UnityGreeter.singleton.starting_session.connect (cleanup);
     }
 
+    private void close_pid (ref Pid pid)
+    {
+        if (pid != 0)
+        {
+            Posix.kill (pid, Posix.SIGTERM);
+            int status;
+            Posix.waitpid (pid, out status, 0);
+            pid = 0;
+        }
+    }
+
     public void cleanup ()
     {
-        if (keyboard_pid != 0)
-        {
-            Posix.kill (keyboard_pid, Posix.SIGTERM);
-            int status;
-            Posix.waitpid (keyboard_pid, out status, 0);
-            keyboard_pid = 0;
-        }
+        close_pid (ref keyboard_pid);
+        close_pid (ref reader_pid);
     }
 
     public override void get_preferred_height (out int min, out int nat)
@@ -468,17 +475,26 @@
         UGSettings.set_boolean (UGSettings.KEY_SCREEN_READER, item.active);
 
         /* Hardcoded orca: */
-        try
-        {
-            if (item.active)
-                Process.spawn_command_line_async ("orca --replace --no-setup --disable splash-window,main-window");
-            else
-                Process.spawn_command_line_async ("orca --quit");
-        }
-        catch (Error e)
-        {
-            warning ("Failed to run Orca: %s", e.message);
-        }
+        if (item.active)
+        {
+            try
+            {
+                string[] argv;
+                Shell.parse_argv ("orca --replace --no-setup --disable splash-window,main-window", out argv);
+                Process.spawn_async (null,
+                                     argv,
+                                     null,
+                                     SpawnFlags.SEARCH_PATH,
+                                     null,
+                                     out reader_pid);
+            }
+            catch (Error e)
+            {
+                warning ("Failed to run Orca: %s", e.message);
+            }
+        }
+        else
+            close_pid (ref reader_pid);
     }
 
     private uint get_indicator_index (Indicator.Object object)