Merge lp://qastaging/~ted/libindicator/upstart-no-dbus into lp://qastaging/libindicator/13.10
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~ted/libindicator/upstart-no-dbus | ||||
Merge into: | lp://qastaging/libindicator/13.10 | ||||
Diff against target: |
294 lines (+29/-152) 2 files modified
libindicator/indicator-ng.c (+6/-67) libindicator/indicator-service-manager.c (+23/-85) |
||||
To merge this branch: | bzr merge lp://qastaging/~ted/libindicator/upstart-no-dbus | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Indicator Applet Developers | Pending | ||
Review via email: mp+166269@code.qastaging.launchpad.net |
Commit message
When running under Upstart session let Upstart manage the service.
Description of the change
When we're running under upstart we want upstart to manage the process lifecycle for the service, not the panel-service. This patch makes it so that when we have an upstart session there isn't any dbus activation attempted. Long term we should be able to assume Upstart user session (default on Saucy) and remove the checking code, but let's keep things usable on Raring for now.
Unmerged revisions
- 500. By Ted Gould
-
Don't unwatch on error, we still want to watch for a new one starting
- 499. By Ted Gould
-
Drop the restartarting the service code
- 498. By Ted Gould
-
Assume Upstart in the manager code
- 497. By Ted Gould
-
Remove the callback
- 496. By Ted Gould
-
Kill the restart code
- 495. By Ted Gould
-
Update to trunk
- 494. By Ted Gould
-
Only build the calcelable if we've got a name
- 493. By Ted Gould
-
Merging trunk
- 492. By Ted Gould
-
Don't make the service manager do DBus activation in the Upstart session case.
- 491. By Ted Gould
-
Don't start the service when we're under the Upstart session
FAILED: Continuous integration, rev:491 jenkins. qa.ubuntu. com/job/ libindicator- ci/21/ jenkins. qa.ubuntu. com/job/ libindicator- saucy-amd64- ci/8/console jenkins. qa.ubuntu. com/job/ libindicator- saucy-armhf- ci/7/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ libindicator- ci/21/rebuild
http://