Merge lp:~azzar1/unity/fix-1012000 into lp:unity
Proposed by
Andrea Azzarone
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andrea Azzarone | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2411 | ||||
Proposed branch: | lp:~azzar1/unity/fix-1012000 | ||||
Merge into: | lp:unity | ||||
Diff against target: |
240 lines (+17/-82) 6 files modified
CMakeLists.txt (+1/-1) launcher/DeviceLauncherIcon.cpp (+1/-62) launcher/DeviceLauncherIcon.h (+0/-6) panel/PanelTitlebarGrabAreaView.cpp (+4/-2) plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-layout.cpp (+7/-7) tests/test_animator.cpp (+4/-4) |
||||
To merge this branch: | bzr merge lp:~azzar1/unity/fix-1012000 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone (community) | Approve | ||
Sam Spilsbury (community) | Approve | ||
Tim Penhey (community) | Needs Information | ||
Review via email: mp+109894@code.launchpad.net |
Commit message
Fix compilation problems on quantal.
Description of the change
== Problem ==
Unity fails to build on quantal.
== Fix ==
Fix compilation errors.
#. Remove "Format..." menu item. libgdu is now deprecated and there is no way to show up the system format dialog.
#. 221 - test_animator_
222 + test_animator_
All variables in the capture list should have automatic storage duration.
== Test ==
Not applicable.
To post a comment you must log in.
Generally looks fine, but I'm confused about the capture lists in the tests at the end. What is with that?