Merge lp://staging/~robert-ancell/indicator-power/unity-control-center2 into lp://staging/indicator-power/14.04

Proposed by Robert Ancell
Status: Merged
Approved by: Lars Karlitski
Approved revision: 222
Merged at revision: 221
Proposed branch: lp://staging/~robert-ancell/indicator-power/unity-control-center2
Merge into: lp://staging/indicator-power/14.04
Diff against target: 32 lines (+9/-2)
2 files modified
debian/control (+1/-1)
src/service.c (+8/-1)
To merge this branch: bzr merge lp://staging/~robert-ancell/indicator-power/unity-control-center2
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+201130@code.staging.launchpad.net

Commit message

Use unity-control-center if it is available

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Shouldn't we list u-c-c first in the recommends order since that's our default desktop/where indicators are used most/the first choice in the code? (same comment for the similar merge requests on other indicators)

Revision history for this message
Robert Ancell (robert-ancell) wrote :

> Shouldn't we list u-c-c first in the recommends order since that's our default
> desktop/where indicators are used most/the first choice in the code? (same
> comment for the similar merge requests on other indicators)

Yes. For some reason at the time I was thinking that would pull u-c-c in before it was ready but I don't think that's the case since ubuntu-desktop depends on gnome-control-center.

222. By Robert Ancell

Recommend unity-control-center before gnome-control-center

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

That looks fine to me, comment approving and letting somebody from the indicator team changing the status if they like it (would be nice to get it reviewed, we need those changes to land to be able to change the default settings app to unity-control-center on the desktop image)

review: Approve

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