Unity

Merge lp://qastaging/~didrocks/unity/fixes-natty-finale into lp://qastaging/unity

fixes-natty-finale
Merge into trunk

Proposed by Didier Roche-Tolomelli on 2011-04-18

Status:

Merged

Approved by:

Gord Allott on 2011-04-18

Approved revision:

no longer in the source branch.

Merged at revision:

1150

Proposed branch:

lp://qastaging/~didrocks/unity/fixes-natty-finale

Merge into:

lp://qastaging/unity

Diff against target:

371 lines (+78/-25)

9 files modified

src/BamfLauncherIcon.cpp (+1/-0)
src/Launcher.cpp (+60/-15)
src/Launcher.h (+5/-0)
src/LauncherController.cpp (+1/-0)
src/LauncherIcon.cpp (+2/-5)
src/PlacesSearchBar.cpp (+1/-1)
src/PlacesView.cpp (+4/-4)
src/PluginAdapter.cpp (+3/-0)
src/WindowManager.h (+1/-0)

To merge this branch:

bzr merge lp://qastaging/~didrocks/unity/fixes-natty-finale

Related bugs:

Bug #734681: Only with few windows (and one maximized) or Dodge active window - When re-focusing on maximised window Unity launcher does not hide	High	Fix Released
Bug #761289: Trash/ws switcher icon in unity resets to default icon theme on the event of a deletion or emptying the trash or after an upgrade	Medium	Fix Released
Bug #763800: compiz crashed with SIGSEGV in PlacesView::OnResizeFrame()	High	Fix Released
Bug #764643: Intellihide stuck with in x=0 on the bfb	High	Fix Released
Bug #764730: Incorrect keynav hilight/opened Quicklist without any request	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gord Allott (community)		2011-04-18	Approve on 2011-04-18
Review via email: mp+58171@code.qastaging.launchpad.net

Description of the change

This branch:
- Fix a wrong state machine with edge reveal
- Remove wrong keynav hilight and quicklist random appearance
- Keep the right icons activated for ws switcher, remove the hack for the trash
- Add an addition g_source_remove crash fix
- Fix another crash on PlacesView::OnResizeFrame
- Fix a wrong state for current focused window when you have few window (or in
dodge active window)