Merge lp://staging/~raof/mir/error-callback-for-display-config into lp://staging/mir
Status: | Merged |
---|---|
Approved by: | Chris Halse Rogers |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3457 |
Proposed branch: | lp://staging/~raof/mir/error-callback-for-display-config |
Merge into: | lp://staging/mir |
Diff against target: |
920 lines (+482/-11) 23 files modified
include/client/mir_toolkit/client_types.h (+32/-0) include/client/mir_toolkit/mir_client_library.h (+1/-0) include/client/mir_toolkit/mir_connection.h (+11/-0) include/client/mir_toolkit/mir_error.h (+55/-0) src/client/CMakeLists.txt (+4/-0) src/client/mir_connection.cpp (+36/-2) src/client/mir_connection.h (+4/-0) src/client/mir_connection_api.cpp (+18/-0) src/client/mir_error.cpp (+35/-0) src/client/mir_error.h (+37/-0) src/client/mir_error_api.cpp (+30/-0) src/client/symbols.map (+3/-0) src/include/common/mir/client_visible_error.h (+55/-0) src/include/server/mir/frontend/template_protobuf_message_processor.h (+11/-0) src/protobuf/mir_protobuf.proto (+21/-0) src/protobuf/symbols.map (+1/-0) src/server/frontend/authorizing_display_changer.cpp (+23/-1) src/server/frontend/protobuf_message_processor.cpp (+7/-0) tests/acceptance-tests/test_new_display_configuration.cpp (+41/-0) tests/integration-tests/test_protobuf.cpp (+7/-7) tests/integration-tests/test_protobuf.proto (+7/-1) tests/unit-tests/client/CMakeLists.txt (+1/-0) tests/unit-tests/client/test_client_mir_error.cpp (+42/-0) |
To merge this branch: | bzr merge lp://staging/~raof/mir/error-callback-for-display-config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Daniel van Vugt | Abstain | ||
Alan Griffiths | Approve | ||
Brandon Schaefer (community) | Approve | ||
Cemil Azizoglu (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+290384@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-03-16.
Commit message
Add an error callback to MirConnection, and use it to handle (some) errors from display configuration.
Description of the change
Add an error callback to MirConnection, and use it to handle (some) errors from display configuration.
Can, and should, be extended to cover all errors which aren't currently handled by creating an error MirSurface, MirBufferStream, etc object. Those objects should probably grow MirError accessors.
Modeled vaguely on GError.
Things we might later want to add to MirError:
* mir_error_
* mir_error_
* void* mir_error_
PASSED: Continuous integration, rev:3408 /mir-jenkins. ubuntu. com/job/ mir-ci/ 586/ /mir-jenkins. ubuntu. com/job/ build-mir/ 486 /mir-jenkins. ubuntu. com/job/ build-0- fetch/516 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 508 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 508 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 496 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 496/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 496 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 496/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 496 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 496/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 496 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 496/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 496 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 496/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 586/rebuild
https:/