Merge lp://qastaging/~didrocks/unity/restack-systray into lp://qastaging/unity

Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Mirco Müller
Approved revision: no longer in the source branch.
Merged at revision: 955
Proposed branch: lp://qastaging/~didrocks/unity/restack-systray
Merge into: lp://qastaging/unity
Diff against target: 161 lines (+30/-4)
8 files modified
com.canonical.Unity.gschema.xml (+1/-1)
po/POTFILES.in (+2/-0)
src/PlaceEntry.h (+2/-1)
src/PlaceEntryHome.cpp (+6/-0)
src/PlaceEntryHome.h (+1/-0)
src/PlaceEntryRemote.cpp (+14/-0)
src/PlaceEntryRemote.h (+2/-0)
src/PlacesSearchBar.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~didrocks/unity/restack-systray
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+53592@code.qastaging.launchpad.net

Description of the change

This branch:
* add Mumble to the systray list (LP: #732682)
* get place-definied search hint. Fallback to 'Search' otherwise. (LP: #733897)

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

All looks fine and works as expected. Approved!

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.