Merge lp:~ted/unity-greeter/upstart-indicators into lp:unity-greeter

[Ted Gould]

Use an Upstart process to start indicator services

Uses a custom Upstart session to start the indicators.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1005
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-greeter-ci/19/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

LGTM.

review: Approve

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2013-10-02 17:46:49 +0000
+++ src/unity-greeter.vala	2013-10-28 19:17:53 +0000
@@ -408,6 +408,7 @@
         Environment.set_variable ("GTK_MODULES", "atk-bridge", false);
 
         Pid atspi_pid = 0;
+        Pid indicator_pid = 0;
 
         try
         {
@@ -508,6 +509,24 @@
 
         if (!do_test_mode)
         {
+            /* Start the indicator services */
+            try
+            {
+                string[] argv;
+
+                Shell.parse_argv ("init --user --startup-event indicator-services-start", out argv);
+                Process.spawn_async (null,
+                                     argv,
+                                     null,
+                                     SpawnFlags.SEARCH_PATH,
+                                     null,
+                                     out indicator_pid);
+            }
+            catch (Error e)
+            {
+                warning ("Error starting Upstart for indicators: %s", e.message);
+            }
+
             /* Make nm-applet hide items the user does not have permissions to interact with */
             Environment.set_variable ("NM_APPLET_HIDE_POLICY_ITEMS", "1", true);
 
@@ -521,9 +540,24 @@
             }
         }
 
+        /* Setup a handler for TERM so we quit cleanly */
+        GLib.Unix.signal_add(GLib.ProcessSignal.TERM, () => {
+            debug("Got a SIGTERM");
+            Gtk.main_quit();
+            return false;
+        });
+
         debug ("Starting main loop");
         Gtk.main ();
 
+        if (indicator_pid != 0)
+        {
+            Posix.kill (indicator_pid, Posix.SIGTERM);
+            int status;
+            Posix.waitpid (indicator_pid, out status, 0);
+            indicator_pid = 0;
+        }
+
         if (atspi_pid != 0)
         {
             Posix.kill (atspi_pid, Posix.SIGKILL);