lp:~vanvugt/mir/optional-callbacks

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~mir-team/mir/trunk

Chris Halse Rogers: Approve on 2013-03-14

Alan Griffiths: Disapprove on 2013-03-13

PS Jenkins bot (community): Approve (continuous-integration) on 2013-03-13

Diff: 999 lines (+236/-200)

21 files modified

examples/demo_client.c (+1/-6)
examples/demo_client_accelerated.cpp (+1/-7)
examples/demo_client_unaccelerated.c (+1/-7)
examples/eglapp.c (+1/-3)
include/mir_toolkit/mir_client_library.h (+19/-13)
include/mir_toolkit/mir_client_library_lightdm.h (+1/-2)
src/client/mir_client_library.cpp (+20/-7)
src/client/mir_connection.cpp (+8/-8)
src/client/mir_connection.h (+3/-5)
src/client/mir_wait_handle.cpp (+24/-0)
src/client/mir_wait_handle.h (+6/-0)
tests/acceptance-tests/test_client_library.cpp (+50/-14)
tests/acceptance-tests/test_focus_management_api.cpp (+2/-10)
tests/acceptance-tests/test_surfaceloop.cpp (+6/-31)
tests/integration-tests/test_display_info.cpp (+1/-7)
tests/integration-tests/test_drm_auth_magic.cpp (+2/-8)
tests/integration-tests/test_error_reporting.cpp (+2/-25)
tests/integration-tests/test_surfaceloop.cpp (+8/-34)
tests/unit-tests/client/test_client_mir_surface.cpp (+1/-5)
tests/unit-tests/client/test_mir_connection.cpp (+4/-8)
tests/unit-tests/client/test_wait_handle.cpp (+75/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1112195: Mir client API lacks simple synchronous interface

High

Fix Released

Link a bug report

Related blueprints

423. By Daniel van Vugt on 2013-03-13

Simplified, and removed the type safety problem.

422. By Daniel van Vugt on 2013-03-13

Fix conflict (build failure) introduced by upstream changes.

421. By Daniel van Vugt on 2013-03-13

Merge latest lp:mir

420. By Daniel van Vugt on 2013-03-12

Clean up: "register_callback" --> "set_callback"

419. By Daniel van Vugt on 2013-03-12

Merge latest lp:mir

418. By Daniel van Vugt on 2013-03-08

Merge test_wait.cpp into test_wait_handle.cpp

417. By Daniel van Vugt on 2013-03-08

Fix conflicts and merge problems with upstream changes.

416. By Daniel van Vugt on 2013-03-08

Merge latest lp:mir

415. By Daniel van Vugt on 2013-03-01

Shrink the diff a little.

414. By Daniel van Vugt on 2013-03-01

Merge latest lp:mir and fix numerous conflicts with mir_toolkit changes.