Merge lp:~ted/unity/upstart-event into lp:unity

[Ted Gould]

Upstart event for when the indicators are loaded by the panel service.

Adds an upstart event for when the indicators are loaded by the panel service. Allows us to start moving to much smarter startup.

[Marco Trevisan (Treviño) (3v1n0)]

Why not just using g_app_info_create_from_commandline ?

It internally does the same things, and it's nicer to read.

[Ted Gould (ted)]

On Tue, 2013-04-23 at 17:57 +0000, Marco Trevisan (Treviño) wrote:

> Why not just using g_app_info_create_from_commandline ?
>
> It internally does the same things, and it's nicer to read.

Because initctl isn't an application with a desktop file. It's just a
commandline utility, so there isn't really any app_info. Plus then I'd
also have an object to track instead of just being able to "fire and
forget" about the command line utility.

[Ted Gould (ted)]

Okay, tested this with an indicator-network job and it works! Cool.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3315
http://jenkins.qa.ubuntu.com/job/unity-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/36/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Upstart has DBus methods to do this (EmitEvent). I feel it would be better to use them rather than spawning processes from indicators or from the shell.

review: Needs Fixing

[Ted Gould (ted)]

On Tue, 2013-04-30 at 23:07 +0000, Mathieu Trudel-Lapierre wrote:

> Upstart has DBus methods to do this (EmitEvent). I feel it would be
> better to use them rather than spawning processes from indicators or
> from the shell.

Can you work with James to get a library building to export that method?
He seems to be willing to entertain the idea.

[Stephen M. Webb (bregma)]

I think this is OK as a stopgap measure, and maybe should be queued for replacement when full upstart session management is in place.

review: Approve

[Ted Gould (ted)]

Is there any reason to not top-approve this? Was it forgotten or on purpos?

[Ted Gould (ted)]

No objections.

=== modified file 'debian/control'
--- debian/control	2013-04-10 22:17:15 +0000
+++ debian/control	2013-04-23 21:10:33 +0000
@@ -97,6 +97,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         upstart,
 Description: Services for the Unity interface
  Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
  community, Unity is all about the combination of familiarity and the future. We
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-03-07 16:02:10 +0000
+++ services/panel-service.c	2013-04-23 21:10:33 +0000
@@ -54,6 +54,7 @@
   GHashTable *panel2entries_hash;
 
   guint  initial_sync_id;
+  guint  ready_signal_id;
   gint32 timeouts[N_TIMEOUT_SLOTS];
 
   IndicatorObjectEntry *last_entry;
@@ -179,6 +180,12 @@
       priv->initial_sync_id = 0;
     }
 
+  if (priv->ready_signal_id)
+    {
+      g_source_remove (priv->ready_signal_id);
+      priv->ready_signal_id = 0;
+    }
+
   for (i = 0; i < N_TIMEOUT_SLOTS; i++)
     {
       if (priv->timeouts[i] > 0)
@@ -473,6 +480,45 @@
   return FALSE;
 }
 
+static gboolean
+ready_signal (PanelService *self)
+{
+  if (PANEL_IS_SERVICE (self))
+    {
+      GError * error = NULL;
+      gchar * argv[] = {
+        "initctl",
+        "--session",
+        "--user",
+        "emit",
+        "--no-wait",
+        "indicators-loaded",
+        NULL,
+      };
+
+      g_spawn_async(NULL, /* Working Directory */
+                    argv,
+                    NULL, /* environment */
+                    G_SPAWN_SEARCH_PATH,
+                    NULL, NULL, /* child setup function */
+                    NULL, /* Pid */
+                    &error);
+
+      if (error != NULL)
+	    {
+          /* NOTE: When we get to the point where we can start
+             assuming upstart user sessions this can be escillated
+             to a warning or higher */
+          g_debug("Unable to signal indicators-loaded to upstart: %s", error->message);
+          g_error_free(error);
+        }
+
+      self->priv->ready_signal_id = 0;
+    }
+
+  return FALSE;
+}
+
 static void
 panel_service_update_menu_keybinding (PanelService *self)
 {
@@ -570,6 +616,7 @@
   panel_service_update_menu_keybinding (self);
 
   priv->initial_sync_id = g_idle_add ((GSourceFunc)initial_resync, self);
+  priv->ready_signal_id = g_idle_add ((GSourceFunc)ready_signal, self);
 }
 
 static gboolean