Merge lp:~ted/indicator-application/startup-cleanup into lp:indicator-application/14.04
Proposed by
Ted Gould
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 254 |
Merged at revision: | 246 |
Proposed branch: | lp:~ted/indicator-application/startup-cleanup |
Merge into: | lp:indicator-application/14.04 |
Diff against target: |
343 lines (+96/-65) 9 files modified
configure.ac (+1/-0) data/Makefile.am (+6/-3) data/indicator-application.conf.in (+3/-2) data/indicator-application.desktop.in (+2/-4) data/upstart/Makefile.am (+9/-0) data/upstart/indicator-application.desktop.in (+8/-0) src/Makefile.am (+1/-1) src/application-service.c (+42/-26) src/indicator-application.c (+24/-29) |
To merge this branch: | bzr merge lp:~ted/indicator-application/startup-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+207774@code.launchpad.net |
Commit message
Synchronize process management across indicators
Description of the change
This merge goes along with all of the other "startup-cleanup" merges to create a consistent startup for all indicators.
To post a comment you must log in.
PASSED: Continuous integration, rev:254 jenkins. qa.ubuntu. com/job/ indicator- application- ci/14/ jenkins. qa.ubuntu. com/job/ indicator- application- trusty- amd64-ci/ 6 jenkins. qa.ubuntu. com/job/ indicator- application- trusty- armhf-ci/ 6 jenkins. qa.ubuntu. com/job/ indicator- application- trusty- armhf-ci/ 6/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- application- ci/14/rebuild
http://