Merge lp:~ted/ubuntu-app-launch/application-starting into lp:ubuntu-app-launch/14.04

[Ted Gould]

Handshake for starting applications

Adding a other observer with a handshake so that we can ensure that Unity knows about an app before we start it.

[lp:~ted/ubuntu-app-launch/application-starting]

108. By Ted Gould on 2013-12-06

Merging trunk with lttng support

109. By Ted Gould on 2013-12-06

Fixing the XML

110. By Ted Gould on 2013-12-06

Be dependent on the lib we use :-)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/168/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/27
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/168/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/169/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/28/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/28
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/169/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/application-starting]

111. By Ted Gould on 2013-12-06

Unsubscribe to the signal when cleaning up

112. By Ted Gould on 2013-12-06

Track the timer and clean it up

113. By Ted Gould on 2013-12-06

Make sure to clean up on tear down not in the test

114. By Ted Gould on 2013-12-06

Clear the timeout signal handler when it gets hit

115. By Ted Gould on 2013-12-06

Killing some returns

116. By Ted Gould on 2013-12-06

Putting expected value first to clean up error messages

117. By Ted Gould on 2013-12-06

Removing duplicate definitions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/170/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/170/rebuild

review: Approve (continuous-integration)

[lp:~ted/ubuntu-app-launch/application-starting]

118. By Ted Gould on 2013-12-06

Killing more returns

[Gerry Boland (gerboland)]

If you must change the package name, please have it replace the old package.

Selecting previously unselected package libupstart-app-launch2-dev:amd64.
Unpacking libupstart-app-launch2-dev:amd64 (from libupstart-app-launch2-dev_0.3+14.04.20131126-0ubuntu1_amd64.deb) ...
dpkg: error processing libupstart-app-launch2-dev_0.3+14.04.20131126-0ubuntu1_amd64.deb (--install):
 trying to overwrite '/usr/lib/x86_64-linux-gnu/libupstart-app-launch.so', which is also in package libupstart-app-launch1-dev:amd64 0.3+14.04.20131126-0ubuntu1

Why not just increment the package version?

review: Needs Fixing

[lp:~ted/ubuntu-app-launch/application-starting]

119. By Ted Gould on 2013-12-06

Removing the filter at the end of the test

120. By Ted Gould on 2013-12-06

Adding replace/conflicts with the previous dev package

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/171/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/172/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Reasoning behind name change was explained to me, withdrawing objection.

FYI, here is the branch that implements support for this change in unity-mir if it eases testing
https://code.launchpad.net/~gerboland/unity-mir/wait-for-upstart-notification/+merge/198041

[Charles Kerr (charlesk)]

Ted, thanks for fixing all those nitpicks I threw at you.

review: Approve

=== modified file 'click-exec-trace.tp'
--- click-exec-trace.tp	2013-12-04 12:55:59 +0000
+++ click-exec-trace.tp	2013-12-06 12:27:28 +0000
@@ -1,6 +1,10 @@
 
 TRACEPOINT_EVENT(upstart_app_launch, click_start, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(upstart_app_launch, click_starting_sent, TP_ARGS(0), TP_FIELDS())
 TRACEPOINT_EVENT(upstart_app_launch, click_found_pkgdir, TP_ARGS(0), TP_FIELDS())
 TRACEPOINT_EVENT(upstart_app_launch, click_configured_env, TP_ARGS(0), TP_FIELDS())
 TRACEPOINT_EVENT(upstart_app_launch, click_read_manifest, TP_ARGS(0), TP_FIELDS())
 TRACEPOINT_EVENT(upstart_app_launch, click_read_desktop, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(upstart_app_launch, click_handshake_wait, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(upstart_app_launch, click_handshake_complete, TP_ARGS(0), TP_FIELDS())
+
 
=== modified file 'click-exec.c'
--- click-exec.c	2013-12-04 12:55:59 +0000
+++ click-exec.c	2013-12-06 12:27:28 +0000
@@ -55,6 +55,13 @@
 
 	tracepoint(upstart_app_launch, click_start);
 
+	handshake_t * handshake = starting_handshake_start(app_id);
+	if (handshake == NULL) {
+		g_warning("Unable to setup starting handshake");
+	}
+
+	tracepoint(upstart_app_launch, click_starting_sent);
+
 	GError * error = NULL;
 	gchar * package = NULL;
 	/* 'Parse' the App ID */
@@ -140,5 +147,11 @@
 	g_free(userdesktopfile);
 	g_free(userdesktoppath);
 
+	tracepoint(upstart_app_launch, click_handshake_wait);
+
+	starting_handshake_wait(handshake);
+
+	tracepoint(upstart_app_launch, click_handshake_complete);
+
 	return 0;
 }
 
=== added directory 'data'
=== added file 'data/com.canonical.UpstartAppLaunch.xml'
--- data/com.canonical.UpstartAppLaunch.xml	1970-01-01 00:00:00 +0000
+++ data/com.canonical.UpstartAppLaunch.xml	2013-12-06 12:27:28 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node>
+	<interface name="com.canonical.UpstartAppLaunch">
+		<signal name="UnityResumeRequest">
+			<arg type="s" name="appid" />
+		</signal>
+		<signal name="UnityResumeResponse">
+			<arg type="s" name="appid" />
+		</signal>
+		<signal name="UnityFocusRequest">
+			<arg type="s" name="appid" />
+		</signal>
+		<signal name="UnityStartingBroadcast">
+			<arg type="s" name="appid" />
+		</signal>
+		<signal name="UnityStartingSignal">
+			<arg type="s" name="appid" />
+		</signal>
+	</interface>
+</node>
 
=== modified file 'debian/control'
--- debian/control	2013-12-06 10:38:35 +0000
+++ debian/control	2013-12-06 12:27:28 +0000
@@ -49,7 +49,7 @@
  .
  This package provides tools for working with the Upstart App Launch.
 
-Package: libupstart-app-launch1
+Package: libupstart-app-launch2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
@@ -62,15 +62,17 @@
  .
  This package contains shared libraries to be used by applications.
 
-Package: libupstart-app-launch1-dev
+Package: libupstart-app-launch2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-dev,
-         libupstart-app-launch1 (= ${binary:Version}),
+         libupstart-app-launch2 (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
+Replaces: libupstart-app-launch1-dev
+Conflicts: libupstart-app-launch1-dev
 Description: library for sending requests to the upstart app launch
  Upstart Job file and associated utilities that is used to launch
  applications in a standard and confined way.
 
=== renamed file 'debian/libupstart-app-launch1-dev.install' => 'debian/libupstart-app-launch2-dev.install'
=== renamed file 'debian/libupstart-app-launch1.install' => 'debian/libupstart-app-launch2.install'
--- debian/libupstart-app-launch1.install	2013-08-02 13:24:59 +0000
+++ debian/libupstart-app-launch2.install	2013-12-06 12:27:28 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libupstart-app-launch.so.1*
+usr/lib/*/libupstart-app-launch.so.2*
 
=== renamed file 'debian/libupstart-app-launch1.symbols' => 'debian/libupstart-app-launch2.symbols'
--- debian/libupstart-app-launch1.symbols	2013-10-08 19:38:15 +0000
+++ debian/libupstart-app-launch2.symbols	2013-12-06 12:27:28 +0000
@@ -1,15 +1,17 @@
-libupstart-app-launch.so.1 libupstart-app-launch1 #MINVER#
+libupstart-app-launch.so.2 libupstart-app-launch2 #MINVER#
  upstart_app_launch_get_primary_pid@Base 0.2
  upstart_app_launch_list_running_apps@Base 0.2
  upstart_app_launch_observer_add_app_failed@Base 0.2
  upstart_app_launch_observer_add_app_focus@Base 0.2
  upstart_app_launch_observer_add_app_resume@Base 0.2
- upstart_app_launch_observer_add_app_start@Base 0.2
+ upstart_app_launch_observer_add_app_started@Base 0replaceme
+ upstart_app_launch_observer_add_app_starting@Base 0replaceme
  upstart_app_launch_observer_add_app_stop@Base 0.2
  upstart_app_launch_observer_delete_app_failed@Base 0.2
  upstart_app_launch_observer_delete_app_focus@Base 0.2
  upstart_app_launch_observer_delete_app_resume@Base 0.2
- upstart_app_launch_observer_delete_app_start@Base 0.2
+ upstart_app_launch_observer_delete_app_started@Base 0replaceme
+ upstart_app_launch_observer_delete_app_starting@Base 0replaceme
  upstart_app_launch_observer_delete_app_stop@Base 0.2
  upstart_app_launch_pid_in_app_id@Base 0.2
  upstart_app_launch_start_application@Base 0.2
 
=== modified file 'desktop-exec-trace.tp'
--- desktop-exec-trace.tp	2013-12-04 17:07:09 +0000
+++ desktop-exec-trace.tp	2013-12-06 12:27:28 +0000
@@ -1,5 +1,7 @@
 
 TRACEPOINT_EVENT(upstart_app_launch, desktop_start, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(upstart_app_launch, desktop_starting_sent, TP_ARGS(0), TP_FIELDS())
 TRACEPOINT_EVENT(upstart_app_launch, desktop_found, TP_ARGS(0), TP_FIELDS())
-TRACEPOINT_EVENT(upstart_app_launch, desktop_finished, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(upstart_app_launch, desktop_handshake_wait, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(upstart_app_launch, desktop_handshake_complete, TP_ARGS(0), TP_FIELDS())
 
 
=== modified file 'desktop-exec.c'
--- desktop-exec.c	2013-12-05 17:08:13 +0000
+++ desktop-exec.c	2013-12-06 12:27:28 +0000
@@ -44,6 +44,13 @@
 	g_setenv("LTTNG_UST_REGISTER_TIMEOUT", "0", FALSE); /* Set to zero if not set */
 	tracepoint(upstart_app_launch, desktop_start);
 
+	handshake_t * handshake = starting_handshake_start(app_id);
+	if (handshake == NULL) {
+		g_warning("Unable to setup starting handshake");
+	}
+
+	tracepoint(upstart_app_launch, desktop_starting_sent);
+
 	gchar * desktopfilename = NULL;
 	GKeyFile * keyfile = keyfile_for_appid(app_id, &desktopfilename);
 
@@ -84,7 +91,11 @@
 		g_free(desktopfilename);
 	}
 
-	tracepoint(upstart_app_launch, desktop_finished);
+	tracepoint(upstart_app_launch, desktop_handshake_wait);
+
+	starting_handshake_wait(handshake);
+
+	tracepoint(upstart_app_launch, desktop_handshake_complete);
 
 	return 0;
 }
 
=== modified file 'helpers.c'
--- helpers.c	2013-11-22 16:35:27 +0000
+++ helpers.c	2013-12-06 12:27:28 +0000
@@ -582,3 +582,85 @@
 
 	return;
 }
+
+static void
+unity_signal_cb (GDBusConnection * con, const gchar * sender, const gchar * path, const gchar * interface, const gchar * signal, GVariant * params, gpointer user_data)
+{
+	GMainLoop * mainloop = (GMainLoop *)user_data;
+	g_main_loop_quit(mainloop);
+}
+
+struct _handshake_t {
+	GDBusConnection * con;
+	GMainLoop * mainloop;
+	guint signal_subscribe;
+	guint timeout;
+};
+
+static gboolean
+unity_too_slow_cb (gpointer user_data)
+{
+	handshake_t * handshake = (handshake_t *)user_data;
+	g_main_loop_quit(handshake->mainloop);
+	handshake->timeout = 0;
+	return G_SOURCE_REMOVE;
+}
+
+handshake_t *
+starting_handshake_start (const gchar *   app_id)
+{
+	GError * error = NULL;
+	handshake_t * handshake = g_new0(handshake_t, 1);
+
+	handshake->mainloop = g_main_loop_new(NULL, FALSE);
+	handshake->con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+
+	if (error != NULL) {
+		g_critical("Unable to connect to session bus: %s", error->message);
+		g_error_free(error);
+		g_free(handshake);
+		return NULL;
+	}
+
+	/* Set up listening for the unfrozen signal from Unity */
+	handshake->signal_subscribe = g_dbus_connection_signal_subscribe(handshake->con,
+		NULL, /* sender */
+		"com.canonical.UpstartAppLaunch", /* interface */
+		"UnityStartingSignal", /* signal */
+		"/", /* path */
+		app_id, /* arg0 */
+		G_DBUS_SIGNAL_FLAGS_NONE,
+		unity_signal_cb, handshake->mainloop,
+		NULL); /* user data destroy */
+
+	/* Send unfreeze to to Unity */
+	g_dbus_connection_emit_signal(handshake->con,
+		NULL, /* destination */
+		"/", /* path */
+		"com.canonical.UpstartAppLaunch", /* interface */
+		"UnityStartingBroadcast", /* signal */
+		g_variant_new("(s)", app_id),
+		&error);
+
+	/* Really, Unity? */
+	handshake->timeout = g_timeout_add_seconds(1, unity_too_slow_cb, handshake);
+
+	return handshake;
+}
+
+void
+starting_handshake_wait (handshake_t * handshake)
+{
+	if (handshake == NULL)
+		return;
+
+	g_main_loop_run(handshake->mainloop);
+
+	if (handshake->timeout != 0)
+		g_source_remove(handshake->timeout);
+	g_main_loop_unref(handshake->mainloop);
+	g_dbus_connection_signal_unsubscribe(handshake->con, handshake->signal_subscribe);
+	g_object_unref(handshake->con);
+
+	g_free(handshake);
+}
 
=== modified file 'helpers.h'
--- helpers.h	2013-11-12 21:06:02 +0000
+++ helpers.h	2013-12-06 12:27:28 +0000
@@ -36,3 +36,7 @@
 void      set_confined_envvars   (const gchar *   package,
                                   const gchar *   app_dir);
 
+typedef struct _handshake_t handshake_t;
+handshake_t * starting_handshake_start   (const gchar *   app_id);
+void      starting_handshake_wait        (handshake_t *   handshake);
+
 
=== modified file 'libupstart-app-launch/CMakeLists.txt'
--- libupstart-app-launch/CMakeLists.txt	2013-08-08 03:54:36 +0000
+++ libupstart-app-launch/CMakeLists.txt	2013-12-06 12:27:28 +0000
@@ -3,8 +3,8 @@
 # Version Info
 ##########################
 
-set(API_VERSION 1)
-set(ABI_VERSION 1)
+set(API_VERSION 2)
+set(ABI_VERSION 2)
 
 
 ##########################
 
=== modified file 'libupstart-app-launch/upstart-app-launch.c'
--- libupstart-app-launch/upstart-app-launch.c	2013-11-25 14:44:42 +0000
+++ libupstart-app-launch/upstart-app-launch.c	2013-12-06 12:27:28 +0000
@@ -163,8 +163,6 @@
 	g_free(app);
 	g_free(inst);
 	nih_unref(job_proxy, NULL);
-
-	return;
 }
 
 static void
@@ -257,7 +255,8 @@
 };
 
 /* The lists of Observers */
-static GList * start_array = NULL;
+static GList * starting_array = NULL;
+static GList * started_array = NULL;
 static GList * stop_array = NULL;
 static GList * focus_array = NULL;
 static GList * resume_array = NULL;
@@ -301,8 +300,6 @@
 	}
 
 	g_free(instance);
-
-	return;
 }
 
 /* Creates the observer structure and registers for the signal with
@@ -339,9 +336,9 @@
 }
 
 gboolean
-upstart_app_launch_observer_add_app_start (upstart_app_launch_app_observer_t observer, gpointer user_data)
+upstart_app_launch_observer_add_app_started (upstart_app_launch_app_observer_t observer, gpointer user_data)
 {
-	return add_app_generic(observer, user_data, "started", &start_array);
+	return add_app_generic(observer, user_data, "started", &started_array);
 }
 
 gboolean
@@ -394,8 +391,6 @@
 		g_variant_get(params, "(&s)", &appid);
 		observer->func(appid, observer->user_data);
 	}
-
-	return;
 }
 
 gboolean
@@ -423,8 +418,6 @@
 		g_warning("Unable to emit response signal: %s", error->message);
 		g_error_free(error);
 	}
-
-	return;
 }
 
 gboolean
@@ -433,6 +426,33 @@
 	return add_session_generic(observer, user_data, "UnityResumeRequest", &resume_array, resume_signal_cb);
 }
 
+/* Handle the starting signal when it occurs, call the observer, then send a signal back when we're done */
+static void
+starting_signal_cb (GDBusConnection * conn, const gchar * sender, const gchar * object, const gchar * interface, const gchar * signal, GVariant * params, gpointer user_data)
+{
+	focus_signal_cb(conn, sender, object, interface, signal, params, user_data);
+
+	GError * error = NULL;
+	g_dbus_connection_emit_signal(conn,
+		sender, /* destination */
+		"/", /* path */
+		"com.canonical.UpstartAppLaunch", /* interface */
+		"UnityStartingSignal", /* signal */
+		params, /* params, the same */
+		&error);
+
+	if (error != NULL) {
+		g_warning("Unable to emit response signal: %s", error->message);
+		g_error_free(error);
+	}
+}
+
+gboolean
+upstart_app_launch_observer_add_app_starting (upstart_app_launch_app_observer_t observer, gpointer user_data)
+{
+	return add_session_generic(observer, user_data, "UnityStartingBroadcast", &starting_array, starting_signal_cb);
+}
+
 gboolean
 upstart_app_launch_observer_add_app_failed (upstart_app_launch_app_failed_observer_t observer, gpointer user_data)
 {
@@ -467,9 +487,9 @@
 }
 
 gboolean
-upstart_app_launch_observer_delete_app_start (upstart_app_launch_app_observer_t observer, gpointer user_data)
+upstart_app_launch_observer_delete_app_started (upstart_app_launch_app_observer_t observer, gpointer user_data)
 {
-	return delete_app_generic(observer, user_data, &start_array);
+	return delete_app_generic(observer, user_data, &started_array);
 }
 
 gboolean
@@ -491,6 +511,12 @@
 }
 
 gboolean
+upstart_app_launch_observer_delete_app_starting (upstart_app_launch_app_observer_t observer, gpointer user_data)
+{
+	return delete_app_generic(observer, user_data, &starting_array);
+}
+
+gboolean
 upstart_app_launch_observer_delete_app_failed (upstart_app_launch_app_failed_observer_t observer, gpointer user_data)
 {
 	return FALSE;
@@ -549,8 +575,6 @@
 
 		nih_unref(instance_proxy, NULL);
 	}
-
-	return;
 }
 
 gchar **
 
=== modified file 'libupstart-app-launch/upstart-app-launch.h'
--- libupstart-app-launch/upstart-app-launch.h	2013-09-26 15:19:22 +0000
+++ libupstart-app-launch/upstart-app-launch.h	2013-12-06 12:27:28 +0000
@@ -80,16 +80,29 @@
 gboolean   upstart_app_launch_stop_application         (const gchar *                     appid);
 
 /**
- * upstart_app_launch_observer_add_app_start:
- * @observer: Callback when an application starts
- * @user_data: (allow none): Data to pass to the observer
- *
- * Sets up a callback to get called each time an application
- * starts.
- *
- * Return value: Whether adding the observer was successful.
- */
-gboolean   upstart_app_launch_observer_add_app_start    (upstart_app_launch_app_observer_t observer,
+ * upstart_app_launch_observer_add_app_starting:
+ * @observer: Callback when an application is about to start
+ * @user_data: (allow none): Data to pass to the observer
+ *
+ * Sets up a callback to get called each time an application
+ * is about to start.  The application will not start until the
+ * function returns.
+ *
+ * Return value: Whether adding the observer was successful.
+ */
+gboolean   upstart_app_launch_observer_add_app_starting (upstart_app_launch_app_observer_t observer,
+                                                         gpointer                          user_data);
+/**
+ * upstart_app_launch_observer_add_app_started:
+ * @observer: Callback when an application started
+ * @user_data: (allow none): Data to pass to the observer
+ *
+ * Sets up a callback to get called each time an application
+ * has been started.
+ *
+ * Return value: Whether adding the observer was successful.
+ */
+gboolean   upstart_app_launch_observer_add_app_started  (upstart_app_launch_app_observer_t observer,
                                                          gpointer                          user_data);
 /**
  * upstart_app_launch_observer_add_app_stop:
@@ -145,16 +158,28 @@
                                                          gpointer                                 user_data);
 
 /**
- * upstart_app_launch_observer_delete_app_start:
- * @observer: Callback to remove
- * @user_data: (allow none): Data that was passed to the observer
- *
- * Removes a previously registered callback to ensure it no longer
- * gets signaled.
- *
- * Return value: Whether deleting the observer was successful.
- */
-gboolean   upstart_app_launch_observer_delete_app_start (upstart_app_launch_app_observer_t observer,
+ * upstart_app_launch_observer_delete_app_starting:
+ * @observer: Callback to remove
+ * @user_data: (allow none): Data that was passed to the observer
+ *
+ * Removes a previously registered callback to ensure it no longer
+ * gets signaled.
+ *
+ * Return value: Whether deleting the observer was successful.
+ */
+gboolean   upstart_app_launch_observer_delete_app_starting (upstart_app_launch_app_observer_t observer,
+                                                            gpointer                          user_data);
+/**
+ * upstart_app_launch_observer_delete_app_started:
+ * @observer: Callback to remove
+ * @user_data: (allow none): Data that was passed to the observer
+ *
+ * Removes a previously registered callback to ensure it no longer
+ * gets signaled.
+ *
+ * Return value: Whether deleting the observer was successful.
+ */
+gboolean   upstart_app_launch_observer_delete_app_started (upstart_app_launch_app_observer_t observer,
                                                          gpointer                          user_data);
 /**
  * upstart_app_launch_observer_delete_app_stop:
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-12-04 17:48:47 +0000
+++ tests/CMakeLists.txt	2013-12-06 12:27:28 +0000
@@ -18,6 +18,13 @@
 
 add_test (helper-test helper-test)
 
+# Helper test
+
+add_executable (helper-handshake-test helper-handshake-test.cc)
+target_link_libraries (helper-handshake-test helpers gtest ${GTEST_LIBS})
+
+add_test (helper-handshake-test helper-handshake-test)
+
 # Second Exec Test
 
 include_directories("${CMAKE_SOURCE_DIR}/libupstart-app-launch")
@@ -42,6 +49,7 @@
 add_test (NAME libual-test-pid COMMAND libual-test --gtest_filter=*ApplicationPid)
 add_test (NAME libual-test-list COMMAND libual-test --gtest_filter=*ApplicationList)
 add_test (NAME libual-test-observer COMMAND libual-test --gtest_filter=*StartStopObserver)
+add_test (NAME libual-test-starting COMMAND libual-test --gtest_filter=*StartingResponses)
 
 # ZG Test
 
 
=== added file 'tests/helper-handshake-test.cc'
--- tests/helper-handshake-test.cc	1970-01-01 00:00:00 +0000
+++ tests/helper-handshake-test.cc	2013-12-06 12:27:28 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+
+extern "C" {
+#include "../helpers.h"
+}
+
+class HelperHandshakeTest : public ::testing::Test
+{
+	private:
+		GTestDBus * testbus = NULL;
+
+	protected:
+		GMainLoop * mainloop = NULL;
+
+		virtual void SetUp() {
+			mainloop = g_main_loop_new(NULL, FALSE);
+			testbus = g_test_dbus_new(G_TEST_DBUS_NONE);
+			g_test_dbus_up(testbus);
+		}
+
+		virtual void TearDown() {
+			g_test_dbus_down(testbus);
+			g_clear_object(&testbus);
+			g_main_loop_unref(mainloop);
+			mainloop = NULL;
+			return;
+		}
+
+	public:
+		GDBusMessage * FilterFunc (GDBusConnection * conn, GDBusMessage * message, gboolean incomming) {
+			if (g_strcmp0(g_dbus_message_get_member(message), "UnityStartingBroadcast") == 0) {
+				GVariant * body = g_dbus_message_get_body(message);
+				GVariant * correct_body = g_variant_new("(s)", "fooapp");
+				g_variant_ref_sink(correct_body);
+
+				[body, correct_body]() {
+					ASSERT_TRUE(g_variant_equal(body, correct_body));
+				}();
+
+				g_variant_unref(correct_body);
+				g_main_loop_quit(mainloop);
+			}
+
+			return message;
+		}
+
+};
+
+static GDBusMessage *
+filter_func (GDBusConnection * conn, GDBusMessage * message, gboolean incomming, gpointer user_data) {
+	return static_cast<HelperHandshakeTest *>(user_data)->FilterFunc(conn, message, incomming);
+}
+
+TEST_F(HelperHandshakeTest, BaseHandshake)
+{
+	GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+	guint filter = g_dbus_connection_add_filter(con, filter_func, this, NULL);
+
+	handshake_t * handshake = starting_handshake_start("fooapp");
+
+	g_main_loop_run(mainloop);
+
+	g_dbus_connection_remove_filter(con, filter);
+
+	g_dbus_connection_emit_signal(con,
+		g_dbus_connection_get_unique_name(con), /* destination */
+		"/", /* path */
+		"com.canonical.UpstartAppLaunch", /* interface */
+		"UnityStartingSignal", /* signal */
+		g_variant_new("(s)", "fooapp"), /* params, the same */
+		NULL);
+
+	starting_handshake_wait(handshake);
+
+	g_object_unref(con);
+
+	return;
+}
+
+static gboolean
+two_second_reached (gpointer user_data)
+{
+	bool * reached = static_cast<bool *>(user_data);
+	*reached = true;
+}
+
+TEST_F(HelperHandshakeTest, HandshakeTimeout)
+{
+	bool timeout_reached = false;
+	handshake_t * handshake = starting_handshake_start("fooapp");
+
+	guint outertimeout = g_timeout_add_seconds(2, two_second_reached, &timeout_reached);
+
+	starting_handshake_wait(handshake);
+
+	ASSERT_FALSE(timeout_reached);
+
+	return;
+}
 
=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2013-11-25 14:49:12 +0000
+++ tests/libual-test.cc	2013-12-06 12:27:28 +0000
@@ -182,6 +182,27 @@
 
 			return found;
 		}
+
+		static gboolean pause_helper (gpointer pmainloop) {
+			g_main_loop_quit((GMainLoop *)pmainloop);
+			return G_SOURCE_REMOVE;
+		}
+
+		void pause (guint time) {
+			if (time > 0) {
+				GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
+				guint timer = g_timeout_add(time, pause_helper, mainloop);
+
+				g_main_loop_run(mainloop);
+
+				g_source_remove(timer);
+				g_main_loop_unref(mainloop);
+			}
+
+			while (g_main_pending()) {
+				g_main_iteration(TRUE);
+			}
+		}
 };
 
 TEST_F(LibUAL, StartApplication)
@@ -307,7 +328,7 @@
 		.name = nullptr
 	};
 
-	ASSERT_TRUE(upstart_app_launch_observer_add_app_start(observer_cb, &start_data));
+	ASSERT_TRUE(upstart_app_launch_observer_add_app_started(observer_cb, &start_data));
 	ASSERT_TRUE(upstart_app_launch_observer_add_app_stop(observer_cb, &stop_data));
 	ASSERT_FALSE(upstart_app_launch_observer_add_app_failed(NULL, NULL)); /* Not yet implemented */
 
@@ -417,7 +438,59 @@
 
 
 	/* Remove */
-	ASSERT_TRUE(upstart_app_launch_observer_delete_app_start(observer_cb, &start_data));
+	ASSERT_TRUE(upstart_app_launch_observer_delete_app_started(observer_cb, &start_data));
 	ASSERT_TRUE(upstart_app_launch_observer_delete_app_stop(observer_cb, &stop_data));
 	ASSERT_FALSE(upstart_app_launch_observer_delete_app_failed(NULL, NULL)); /* Not yet implemented */
 }
+
+static GDBusMessage *
+filter_starting (GDBusConnection * conn, GDBusMessage * message, gboolean incomming, gpointer user_data)
+{
+	if (g_strcmp0(g_dbus_message_get_member(message), "UnityStartingSignal") == 0) {
+		unsigned int * count = static_cast<unsigned int *>(user_data);
+		(*count)++;
+		g_object_unref(message);
+		return NULL;
+	}
+
+	return message;
+}
+
+static void
+starting_observer (const gchar * appid, gpointer user_data)
+{
+	std::string * last = static_cast<std::string *>(user_data);
+	*last = appid;
+	return;
+}
+
+TEST_F(LibUAL, StartingResponses)
+{
+	std::string last_observer;
+	unsigned int starting_count = 0;
+	GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+	guint filter = g_dbus_connection_add_filter(session,
+		filter_starting,
+		&starting_count,
+		NULL);
+
+	EXPECT_TRUE(upstart_app_launch_observer_add_app_starting(starting_observer, &last_observer));
+
+	g_dbus_connection_emit_signal(session,
+		NULL, /* destination */
+		"/", /* path */
+		"com.canonical.UpstartAppLaunch", /* interface */
+		"UnityStartingBroadcast", /* signal */
+		g_variant_new("(s)", "foo"), /* params, the same */
+		NULL);
+
+	pause(100);
+
+	EXPECT_EQ("foo", last_observer);
+	EXPECT_EQ(1, starting_count);
+
+	EXPECT_TRUE(upstart_app_launch_observer_delete_app_starting(starting_observer, &last_observer));
+
+	g_dbus_connection_remove_filter(session, filter);
+	g_object_unref(session);
+}
 
=== modified file 'tests/second-exec-test.cc'
--- tests/second-exec-test.cc	2013-10-04 19:22:41 +0000
+++ tests/second-exec-test.cc	2013-12-06 12:27:28 +0000
@@ -58,8 +58,6 @@
 
 			upstart_app_launch_observer_add_app_focus(focus_cb, this);
 			upstart_app_launch_observer_add_app_resume(resume_cb, this);
-
-			return;
 		}
 		virtual void TearDown() {
 			upstart_app_launch_observer_delete_app_focus(focus_cb, this);
@@ -67,8 +65,6 @@
 
 			g_test_dbus_down(testbus);
 			g_object_unref(testbus);
-
-			return;
 		}
 
 		static gboolean pause_helper (gpointer pmainloop) {
@@ -90,8 +86,6 @@
 			while (g_main_pending()) {
 				g_main_iteration(TRUE);
 			}
-
-			return;
 		}
 };
 
 
=== modified file 'upstart-app-watch.c'
--- upstart-app-watch.c	2013-09-24 22:18:11 +0000
+++ upstart-app-watch.c	2013-12-06 12:27:28 +0000
@@ -20,30 +20,37 @@
 #include "libupstart-app-launch/upstart-app-launch.h"
 
 void
+starting (const gchar * appid, gpointer user_data)
+{
+	g_print("Starting %s\n", appid);
+	return;
+}
+
+void
 started (const gchar * appid, gpointer user_data)
 {
-	g_print("Start  %s\n", appid);
+	g_print("Started  %s\n", appid);
 	return;
 }
 
 void
 stopped (const gchar * appid, gpointer user_data)
 {
-	g_print("Stop   %s\n", appid);
+	g_print("Stop     %s\n", appid);
 	return;
 }
 
 void
 resume (const gchar * appid, gpointer user_data)
 {
-	g_print("Resume %s\n", appid);
+	g_print("Resume   %s\n", appid);
 	return;
 }
 
 void
 focus (const gchar * appid, gpointer user_data)
 {
-	g_print("Focus  %s\n", appid);
+	g_print("Focus    %s\n", appid);
 	return;
 }
 
@@ -60,7 +67,7 @@
 			break;
 	}
 
-	g_print("Focus  %s (%s)\n", appid, failstr);
+	g_print("Fail   %s (%s)\n", appid, failstr);
 	return;
 }
 
@@ -68,7 +75,8 @@
 int
 main (int argc, gchar * argv[])
 {
-	upstart_app_launch_observer_add_app_start(started, NULL);
+	upstart_app_launch_observer_add_app_starting(starting, NULL);
+	upstart_app_launch_observer_add_app_started(started, NULL);
 	upstart_app_launch_observer_add_app_stop(stopped, NULL);
 	upstart_app_launch_observer_add_app_focus(focus, NULL);
 	upstart_app_launch_observer_add_app_resume(resume, NULL);
@@ -77,7 +85,8 @@
 	GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 
-	upstart_app_launch_observer_delete_app_start(started, NULL);
+	upstart_app_launch_observer_delete_app_starting(starting, NULL);
+	upstart_app_launch_observer_delete_app_started(started, NULL);
 	upstart_app_launch_observer_delete_app_stop(stopped, NULL);
 	upstart_app_launch_observer_delete_app_focus(focus, NULL);
 	upstart_app_launch_observer_delete_app_resume(resume, NULL);