Merge lp:~charlesk/indicator-application/lp-1197788 into lp:indicator-application/14.04

[Charles Kerr]

When we can't get a handle to the system bus, exit gracefully instead of crashing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-application-ci/9/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Thank you.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-application-autolanding/8/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-amd64-autolanding/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Looks like a Jenkins hiccup. Starting a new pass.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-application-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-application-ci/10/rebuild

review: Approve (continuous-integration)

=== modified file 'src/application-service-watcher.c'
--- src/application-service-watcher.c	2012-12-18 19:08:50 +0000
+++ src/application-service-watcher.c	2013-10-23 17:07:09 +0000
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -158,8 +159,9 @@
 	GError * error = NULL;
 	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
+		g_warning("Unable to get session bus: %s", error->message);
 		g_error_free(error);
+		exit(0);
 		return;
 	}