Merge lp://qastaging/~larsu/libindicator/new-indicator-file-format into lp://qastaging/libindicator/13.10

Proposed by Lars Karlitski
Status: Superseded
Proposed branch: lp://qastaging/~larsu/libindicator/new-indicator-file-format
Merge into: lp://qastaging/libindicator/13.10
Diff against target: 277 lines (+107/-38)
6 files modified
README (+35/-0)
libindicator/indicator-ng.c (+61/-29)
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
Reviewer Review Type Date Requested Status
Ted Gould (community) Needs Information
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+165713@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-05-25.

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.indicator.test vs
com.canonical.test.indicator), which caused some confusion on when to use
which. Now, the file name *is* the bus name, and the `BusName` key has been
dropped.

The new file format is documented in README.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Note: Jenkins fails because -Werror is stupid.

I fixed this as part of another merge request on libindicator (lp:~larsu/libindicator/call-ido-init). Let's merge that one first.

Revision history for this message
Ted Gould (ted) wrote :

It seems odd to me to check state using g_assert() instead of g_return_if_fail(). Both generate critical errors, but one doesn't crash the whole panel service. I don't see the benefit of crashing the whole panel service.

review: Needs Information
Revision history for this message
Ted Gould (ted) wrote :

Uhg, wrong tab :-(

492. By Lars Karlitski

indicator-ng: fix crash

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches