Merge lp:~ted/ubuntu-app-launch/lp1495871-unref-context into lp:ubuntu-app-launch/15.04

[Ted Gould]

Ensure all pending events on the context are complete before unref'ing it.

See long description in 15.10 MR

https://code.launchpad.net/~ted/ubuntu-app-launch/lp1495871-unref-context/+merge/271322

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/lp1495871-unref-context]

215. By Ted Gould on 2015-12-07

Merge FTBFS

Unmerged revisions

215. By Ted Gould on 2015-12-07

Merge FTBFS

=== modified file 'helpers-shared.c'
--- helpers-shared.c	2015-07-15 02:32:54 +0000
+++ helpers-shared.c	2015-09-16 20:13:16 +0000
@@ -145,6 +145,8 @@
 	cgroup_manager_connection_core_cb(g_dbus_connection_new_for_address_finish, res, (cgm_connection_t *)data);
 }
 
+G_DEFINE_QUARK(CGMANAGER_CONTEXT, cgmanager_context);
+
 /* Get the connection to the cgroup manager */
 GDBusConnection *
 cgroup_manager_connection (void)
@@ -191,7 +193,9 @@
 	g_main_context_pop_thread_default(context);
 
 	if (!use_session_bus && connection.con != NULL) {
-		g_object_set_data(G_OBJECT(connection.con), "cgmanager-context", context);
+		g_object_set_qdata(G_OBJECT(connection.con),
+		                   cgmanager_context_quark(),
+		                   context);
 	} else {
 		g_main_context_unref(context);
 	}
@@ -213,7 +217,7 @@
 	if (cgmanager == NULL)
 		return;
 
-	GMainContext * creationcontext = g_object_get_data(G_OBJECT(cgmanager), "cgmanager-context");
+	GMainContext * creationcontext = g_object_get_qdata(G_OBJECT(cgmanager), cgmanager_context_quark());
 	if (creationcontext == NULL) {
 		g_object_unref(cgmanager);
 		return;
@@ -228,6 +232,11 @@
 	}
 
 	g_object_unref(cgmanager);
+
+	while (g_main_context_pending(creationcontext)) {
+		g_main_context_iteration(creationcontext, TRUE /* may block */);
+	}
+
 	g_main_context_unref(creationcontext);
 }
 
 
=== modified file 'libubuntu-app-launch/ubuntu-app-launch.h'
--- libubuntu-app-launch/ubuntu-app-launch.h	2015-09-16 20:13:16 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.h	2015-09-16 20:13:16 +0000
@@ -394,7 +394,7 @@
  * Checks to see if an application is running and returns
  * the PIDs associated with it.
  *
- * Return Value: (transfer full) (element-type GLib.Pid) A list
+ * Return Value: (transfer full) (element-type GLib.Pid): A list
  *   of PIDs associated with @appid, empty if not running.
  */
 GList *     ubuntu_app_launch_get_pids                 (const gchar *                     appid);