Application Indicators

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

  1. lp-1197788
  2. Merge into trunk.14.04
Proposed by Charles Kerr
Status: Merged
Approved by: Charles Kerr
Approved revision: 241
Merged at revision: 241
Proposed branch: lp:~charlesk/indicator-application/lp-1197788
Merge into: lp:indicator-application/14.04
Diff against target: 21 lines (+3/-1)
1 file modified
src/application-service-watcher.c (+3/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-application/lp-1197788
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+192368@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Lars Karlitski (larsu) wrote :

Thank you.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks like a Jenkins hiccup. Starting a new pass.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/application-service-watcher.c'
2--- src/application-service-watcher.c 2012-12-18 19:08:50 +0000
3+++ src/application-service-watcher.c 2013-10-23 17:07:09 +0000
4@@ -24,6 +24,7 @@
5 #include "config.h"
6 #endif
7
8+#include <stdlib.h>
9 #include <dbus/dbus-glib.h>
10 #include <dbus/dbus-glib-lowlevel.h>
11 #include <dbus/dbus-glib-bindings.h>
12@@ -158,8 +159,9 @@
13 GError * error = NULL;
14 DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
15 if (error != NULL) {
16- g_error("Unable to get session bus: %s", error->message);
17+ g_warning("Unable to get session bus: %s", error->message);
18 g_error_free(error);
19+ exit(0);
20 return;
21 }
22

Subscribers

People subscribed via source and target branches