Merge lp://qastaging/~larsu/libindicator/new-indicator-file-format into lp://qastaging/libindicator/13.10
Status: | Merged |
---|---|
Approved by: | Ted Gould |
Approved revision: | 491 |
Merge reported by: | Lars Karlitski |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~larsu/libindicator/new-indicator-file-format |
Merge into: | lp://qastaging/libindicator/13.10 |
Prerequisite: | lp://qastaging/~larsu/libindicator/call-ido-init |
Diff against target: |
295 lines (+109/-43) 6 files modified
README (+35/-0) libindicator/indicator-ng.c (+63/-34) tests/com.canonical.indicator.no-such-service (+0/-1) tests/com.canonical.indicator.test (+3/-1) tests/test-indicator-ng.c (+5/-5) tools/indicator-loader.c (+3/-2) |
To merge this branch: | bzr merge lp://qastaging/~larsu/libindicator/new-indicator-file-format |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+165738@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2013-05-24.
Commit message
IndicatorNg: update indicator file format
The old file format had some shortcomings:
(1) It was impossible to efficiently reuse a menu for different profiles,
because the profile name was implicit in the object path. The only way to do
this was to export the same menu twice. Now, object paths have to be set
explicitly in the indicator file.
(2) The well-known dbus name of a service and the name of its service file were
similar but slightly different (com.canonical.
com.canonical.
which. Now, the file name *is* the bus name, and the `BusName` key has been
dropped.
The new file format is documented in README.
FAILED: Continuous integration, rev:491 jenkins. qa.ubuntu. com/job/ libindicator- ci/17/ jenkins. qa.ubuntu. com/job/ libindicator- saucy-amd64- ci/4/console jenkins. qa.ubuntu. com/job/ libindicator- saucy-armhf- ci/3/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ libindicator- ci/17/rebuild
http://