Merge lp:~ted/ubuntu-app-launch/session-bus into lp:ubuntu-app-launch/14.04

[Ted Gould]

Use Upstart on the session bus instead of the private bus

Upstart 1.11 connects to the session bus so we can use it there without having another connection. Way better. Let's do that!

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/session-bus]

91. By Ted Gould on 2013-11-25

Upstart only has two numbers

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

WfM on the phone, and it's always nice to drop out pieces of code. :)

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-11-19 03:35:22 +0000
+++ debian/control	2013-11-25 16:27:39 +0000
@@ -17,6 +17,7 @@
                libupstart-dev,
                libzeitgeist-2.0-dev,
                python3-dbusmock,
+               upstart (>= 1.11),
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/upstart-app-launch
 # If you aren't a member of ~indicator-applet-developers but need to upload packaging changes,
@@ -30,6 +31,7 @@
          ${misc:Depends},
          click (>= 0.4.9),
          click-apparmor,
+         upstart (>= 1.11),
          zeitgeist,
 Description: Upstart Job for Launching Applications
  Upstart Job file and associated utilities that is used to launch
 
=== modified file 'libupstart-app-launch/upstart-app-launch.c'
--- libupstart-app-launch/upstart-app-launch.c	2013-11-19 02:56:47 +0000
+++ libupstart-app-launch/upstart-app-launch.c	2013-11-25 16:27:39 +0000
@@ -34,26 +34,11 @@
 	DBusConnection * conn;
 	DBusError        error;
 	const gchar *    bus_name = NULL;
-	gboolean         use_private = FALSE;
 
 	dbus_error_init(&error);
-	use_private = (g_getenv("UPSTART_APP_LAUNCH_USE_SESSION") == NULL);
-
-	if (use_private) {
-		const gchar *    upstart_session;
-
-		upstart_session = g_getenv("UPSTART_SESSION");
-		if (upstart_session == NULL) {
-			g_warning("Not running under Upstart User Session");
-			dbus_error_free(&error);
-			return NULL;
-		}
-
-		conn = dbus_connection_open(upstart_session, &error);
-	} else {
-		conn = dbus_bus_get(DBUS_BUS_SESSION, &error);
-		bus_name = "com.ubuntu.Upstart";
-	}
+
+	conn = dbus_bus_get(DBUS_BUS_SESSION, &error);
+	bus_name = "com.ubuntu.Upstart";
 
 	if (conn == NULL) {
 		g_warning("Unable to connect to the Upstart Session: %s", error.message);
@@ -70,8 +55,6 @@
 
 	if (upstart == NULL) {
 		g_warning("Unable to build proxy to Upstart");
-		if (use_private)
-			dbus_connection_close(conn);
 		dbus_connection_unref(conn);
 		return NULL;
 	}
@@ -251,22 +234,7 @@
 	}
 
 	GError * error = NULL;
-
-	if (g_getenv("UPSTART_APP_LAUNCH_USE_SESSION") == NULL) {
-		const gchar * upstart_addr = g_getenv("UPSTART_SESSION");
-		if (upstart_addr == NULL) {
-			g_print("Doesn't appear to be an upstart user session\n");
-			return NULL;
-		}
-
-		gdbus_upstart = g_dbus_connection_new_for_address_sync(upstart_addr,
-															   G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
-															   NULL, /* auth */
-															   NULL, /* cancel */
-															   &error);
-	} else {
-		gdbus_upstart = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
-	}
+	gdbus_upstart = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
 
 	if (error != NULL) {
 		g_warning("Unable to connect to Upstart bus: %s", error->message);
 
=== modified file 'test-conffile.sh'
--- test-conffile.sh	2013-07-02 17:17:08 +0000
+++ test-conffile.sh	2013-11-25 16:27:39 +0000
@@ -5,7 +5,7 @@
 # Only test on newer versions of Upstart, like not the
 # versions on the builders
 if [ ${UPSTARTVERSION} -gt 7 ] ; then
-	init-checkconf $1
+	dbus-test-runner --task init-checkconf --parameter "$1" --task-name init-checkconf
 else
 	echo "Upstart Version: $UPSTARTVERSION"
 	echo "  ....Skipping Tests"
 
=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2013-11-19 03:02:31 +0000
+++ tests/libual-test.cc	2013-11-25 16:27:39 +0000
@@ -48,8 +48,6 @@
 		}
 
 		virtual void SetUp() {
-			g_setenv("UPSTART_APP_LAUNCH_USE_SESSION", "1", TRUE);
-
 			service = dbus_test_service_new(NULL);
 
 			debugConnection();