Unity

Merge lp://qastaging/~unity-team/unity/fix.810325 into lp://qastaging/unity

fix.810325
Merge into trunk

Proposed by Mirco Müller on 2011-07-20

Status:

Superseded

Proposed branch:

lp://qastaging/~unity-team/unity/fix.810325

Merge into:

lp://qastaging/unity

Diff against target:

1785 lines (+998/-104) (has conflicts)

17 files modified

CMakeLists.txt (+5/-5)
com.canonical.Unity.gschema.xml (+6/-0)
plugins/unityshell/src/BGHash.cpp (+528/-0)
plugins/unityshell/src/BGHash.h (+71/-0)
plugins/unityshell/src/IconTexture.cpp (+3/-1)
plugins/unityshell/src/Launcher.cpp (+36/-4)
plugins/unityshell/src/Launcher.h (+42/-39)
plugins/unityshell/src/PanelView.cpp (+84/-27)
plugins/unityshell/src/PanelView.h (+20/-0)
plugins/unityshell/src/PlacesView.cpp (+42/-14)
plugins/unityshell/src/PlacesView.h (+5/-4)
plugins/unityshell/src/UBusMessages.h (+4/-0)
plugins/unityshell/src/unityshell.cpp (+7/-7)
plugins/unityshell/src/unityshell.h (+7/-2)
tests/CMakeLists.txt (+12/-0)
tests/TestBGHash.cpp (+122/-0)
tests/TestPlaces.cpp (+4/-1)

Text conflict in plugins/unityshell/src/PanelView.cpp
Text conflict in plugins/unityshell/src/PanelView.h

To merge this branch:

bzr merge lp://qastaging/~unity-team/unity/fix.810325

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity Team		2011-07-20	Pending
Review via email: mp+68534@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2011-07-21.

Description of the change

Once the new average-color of the wallpaper is computed, in addition to being broadcasted via ubus within the unity-process, it is also written to a newly introduced GSettings key "com.canonical.Unity average-bg-color".

This will be picked up by the NotifyOSD-process, thus it is able to update the rendering of future notifications.

Unmerged revisions

1274. By Mirco Müller on 2011-07-20: sometimes my brain hurts
1273. By Mirco Müller on 2011-07-19: Trying to fix LP: #810325
1272. By Gord Allott on 2011-07-19: merged latest trunk
1271. By Gord Allott on 2011-07-19: added dep on unity-core for the tests
1270. By Gord Allott on 2011-07-19: initalises bghash in unity shell instead of the dash
1269. By Gord Allott on 2011-07-18: merge latest trunk
1268. By Gord Allott on 2011-07-18: added request colour support over ubus
1267. By Gord Allott on 2011-07-14: bias the left hand side
1266. By Gord Allott on 2011-07-13: added support on the launcher for changing the colour, my editor fixed the whitespace in the launcher too, sorry about that.
1265. By Gord Allott on 2011-07-13: merged trunk, hated CMake some more