Merge lp://staging/~vanvugt/mir/parenting-client-api into lp://staging/mir
Proposed by
Daniel van Vugt
Status: | Rejected |
---|---|
Rejected by: | Daniel van Vugt |
Proposed branch: | lp://staging/~vanvugt/mir/parenting-client-api |
Merge into: | lp://staging/mir |
Prerequisite: | lp://staging/~vanvugt/mir/parenting-server-api |
Diff against target: |
289 lines (+145/-1) 13 files modified
client-ABI-sha1sums (+1/-1) include/client/mir_toolkit/mir_surface.h (+16/-0) src/client/connection_surface_map.h (+1/-0) src/client/mir_connection.cpp (+5/-0) src/client/mir_connection.h (+3/-0) src/client/mir_surface.cpp (+7/-0) src/client/mir_surface.h (+1/-0) src/client/mir_surface_api.cpp (+22/-0) src/client/surface_map.cpp (+7/-0) src/client/surface_map.h (+1/-0) tests/acceptance-tests/test_client_library.cpp (+43/-0) tests/acceptance-tests/test_client_surface_events.cpp (+33/-0) tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+5/-0) |
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/parenting-client-api |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Cemil Azizoglu (community) | Disapprove | ||
Alan Griffiths | Disapprove | ||
Andreas Pokorny (community) | Needs Fixing | ||
Robert Carr (community) | Needs Fixing | ||
Alberto Aguirre (community) | Needs Fixing | ||
Review via email:
|
Commit message
Introduce a client API for surface parenting.
To post a comment you must log in.
Unmerged revisions
- 2051. By Daniel van Vugt
-
Merge latest paren branch (and trunk) and fix a conflict.
- 2050. By Daniel van Vugt
-
Merge latest parent branch including trunk
- 2049. By Daniel van Vugt
-
Merge latest parent branch
- 2048. By Daniel van Vugt
-
Merge latest parent branch.
- 2047. By Daniel van Vugt
-
Merge latest parent (resolve criss-cross)
- 2046. By Daniel van Vugt
-
Merge latest trunk and fix a conflict
- 2045. By Daniel van Vugt
-
Merge latest parent branch (and trunk)
- 2044. By Daniel van Vugt
-
Merge latest parent branch
- 2043. By Daniel van Vugt
-
Merge latest parent branch (and trunk)
- 2042. By Daniel van Vugt
-
Merge latest parent branch (test enhancements only)
PASSED: Continuous integration, rev:2042 jenkins. qa.ubuntu. com/job/ mir-ci/ 2024/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/16 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/16 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 13 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 13/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/2024/ rebuild
http://