Merge lp://qastaging/~robert-ancell/indicator-datetime/unity-control-center2 into lp://qastaging/indicator-datetime/14.04

Proposed by Robert Ancell
Status: Merged
Approved by: Charles Kerr
Approved revision: 294
Merged at revision: 293
Proposed branch: lp://qastaging/~robert-ancell/indicator-datetime/unity-control-center2
Merge into: lp://qastaging/indicator-datetime/14.04
Diff against target: 239 lines (+110/-10)
10 files modified
CMakeLists.txt (+15/-1)
data/CMakeLists.txt (+22/-1)
data/unity-datetime-panel.desktop.in (+13/-0)
debian/control (+14/-1)
debian/gnome-control-center-datetime.install (+2/-2)
debian/unity-control-center-datetime.install (+3/-0)
panel-gnome/CMakeLists.txt (+5/-4)
panel-unity/CMakeLists.txt (+26/-0)
panel/datetime-prefs.c (+9/-1)
po/POTFILES.in (+1/-0)
To merge this branch: bzr merge lp://qastaging/~robert-ancell/indicator-datetime/unity-control-center2
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+201129@code.qastaging.launchpad.net

Commit message

Support both gnome-control-center and unity-control-center

Description of the change

Compile a Unity Control Center panel.

Things to note:
- unity-control-center is now in Universe, with a MIR in process
- This relies on both control center APIs staying the same, but I don't know of any reason why that would change in the future
- It supports both control centers so this can be uploaded now and easily migrated. We can choose to drop support for gnome-control-center in the future (don't know if the Ubuntu GNOME people will use it).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
294. 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
Charles Kerr (charlesk) wrote :

Looks great, thanks Robert!

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