Merge lp://staging/~albaguirre/mir/dialogs_and_tooltips into lp://staging/mir
Proposed by
Alberto Aguirre
Status: | Merged |
---|---|
Approved by: | Alan Griffiths |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2249 |
Proposed branch: | lp://staging/~albaguirre/mir/dialogs_and_tooltips |
Merge into: | lp://staging/mir |
Diff against target: |
520 lines (+290/-41) 13 files modified
client-ABI-sha1sums (+1/-1) include/client/mir_toolkit/mir_surface.h (+87/-4) include/server/mir/scene/surface_creation_parameters.h (+2/-2) server-ABI-sha1sums (+1/-1) src/client/mir_surface.cpp (+5/-6) src/client/mir_surface.h (+1/-1) src/client/mir_surface_api.cpp (+50/-8) src/client/symbols.map (+3/-1) src/protobuf/mir_protobuf.proto (+1/-1) src/server/frontend/session_mediator.cpp (+4/-4) src/server/scene/surface_creation_parameters.cpp (+2/-2) tests/acceptance-tests/test_client_surfaces.cpp (+52/-1) tests/integration-tests/client/test_mirsurface.cpp (+81/-9) |
To merge this branch: | bzr merge lp://staging/~albaguirre/mir/dialogs_and_tooltips |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Robert Carr (community) | Approve | ||
Chris Halse Rogers | Needs Fixing | ||
Review via email:
|
Commit message
Add API to create dialog and tooltip surfaces.
Description of the change
Add API to create dialog and tooltip surfaces.
To post a comment you must log in.
FAILED: Continuous integration, rev:2231 jenkins. qa.ubuntu. com/job/ mir-ci/ 2666/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/879 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/879 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/841/ console jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 663 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 663/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 841 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 841/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/3956/ console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/2666/ rebuild
http://