Unity

Merge lp://staging/~unity-team/unity/trunk-cherrypicks-for-6.0 into lp://staging/unity/6.0

  1. trunk-cherrypicks-for-6.0
  2. Merge into 6.0
Proposed by Michal Hruby
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 2745
Proposed branch: lp://staging/~unity-team/unity/trunk-cherrypicks-for-6.0
Merge into: lp://staging/unity/6.0
Diff against target: 1075 lines (+353/-175)
30 files modified
dash/DashView.cpp (+0/-5)
dash/DashView.h (+0/-3)
dash/ResultViewGrid.cpp (+14/-2)
dash/previews/ActionButton.cpp (+0/-5)
dash/previews/PreviewInfoHintWidget.cpp (+0/-1)
launcher/BamfLauncherIcon.cpp (+24/-21)
launcher/FavoriteStoreGSettings.cpp (+3/-3)
launcher/StandaloneSwitcher.cpp (+2/-2)
launcher/SwitcherController.cpp (+1/-2)
launcher/SwitcherController.h (+1/-1)
launcher/VolumeImp.cpp (+4/-1)
manual-tests/Switcher.txt (+1/-0)
plugins/unityshell/resources/emblem_apps.svg (+90/-19)
plugins/unityshell/resources/emblem_others.svg (+12/-0)
plugins/unityshell/resources/emblem_video.svg (+58/-17)
plugins/unityshell/resources/lens-nav-gwibber.svg (+6/-8)
plugins/unityshell/src/unityshell.cpp (+10/-4)
plugins/unityshell/src/unityshell.h (+3/-1)
tests/autopilot/unity/emulators/icons.py (+4/-0)
tests/autopilot/unity/tests/test_home_lens.py (+4/-1)
tests/gmockvolume.c (+18/-0)
tests/gmockvolume.h (+2/-0)
tests/test_switcher_controller.cpp (+3/-3)
tests/test_volume_imp.cpp (+5/-2)
unity-shared/CoverArt.cpp (+2/-2)
unity-shared/DashStyle.cpp (+1/-1)
unity-shared/IconLoader.cpp (+57/-40)
unity-shared/PluginAdapter.h (+2/-0)
unity-shared/PluginAdapterCompiz.cpp (+25/-30)
unity-shared/SearchBar.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~unity-team/unity/trunk-cherrypicks-for-6.0
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Didier Roche-Tolomelli Approve
Review via email: mp+127017@code.staging.launchpad.net

Commit message

Cherrypicks from unity's trunk for 6.8.0

Description of the change

Distro-approved cherrypicks from lp:unity to go into the 6.8.0 release.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

I trust Michal that it's the full branches we discussed about :)
It seems to be those from the revisions.

review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks good.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Cool, but what are the bug numbers being fixed here?

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

OK I've linked the bugs to this branch, best I can tell.

Please link or document the bugs being fixed next time.

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

to all changes: