lp:~robertcarr/mir/focus-tell-dont-ask

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

Robert Carr (community): Disapprove on 2013-10-04

Alan Griffiths: Needs Fixing on 2013-10-01

Daniel van Vugt: Needs Fixing on 2013-10-01

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2013-09-30

Alexandros Frantzis: Pending requested 2013-09-30

kevin gunn: Pending requested 2013-09-30

Diff: 919 lines (+385/-113)

26 files modified

debian/changelog (+8/-2)
include/server/mir/default_server_configuration.h (+3/-0)
include/server/mir/frontend/connector_report.h (+0/-1)
include/server/mir/frontend/messenger_report.h (+49/-0)
include/server/mir/frontend/protobuf_ipc_factory.h (+3/-1)
include/server/mir/logging/messenger_report.h (+49/-0)
include/server/mir/shell/application_session.h (+6/-0)
include/server/mir/shell/default_focus_mechanism.h (+2/-2)
include/server/mir/shell/session.h (+5/-0)
include/test/mir_test_doubles/mock_shell_session.h (+3/-0)
include/test/mir_test_doubles/stub_ipc_factory.h (+6/-1)
include/test/mir_test_doubles/stub_shell_session.h (+8/-0)
src/server/default_server_configuration.cpp (+31/-3)
src/server/frontend/CMakeLists.txt (+1/-0)
src/server/frontend/null_messenger_report.cpp (+25/-0)
src/server/frontend/protobuf_session_creator.cpp (+2/-2)
src/server/frontend/socket_messenger.cpp (+11/-2)
src/server/frontend/socket_messenger.h (+6/-1)
src/server/logging/CMakeLists.txt (+1/-0)
src/server/logging/messenger_report.cpp (+46/-0)
src/server/shell/application_session.cpp (+39/-3)
src/server/shell/default_focus_mechanism.cpp (+10/-18)
tests/acceptance-tests/test_client_focus_notification.cpp (+3/-1)
tests/unit-tests/frontend/CMakeLists.txt (+1/-0)
tests/unit-tests/frontend/test_socket_messenger.cpp (+37/-0)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+30/-76)

api

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

Alan Griffiths: Needs Fixing on 2013-09-25

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2013-09-24

kevin gunn (community): Needs Fixing on 2013-09-23

Daniel van Vugt: Pending requested 2013-09-23

Alexandros Frantzis: Pending requested 2013-09-23

Diff: 449 lines (+121/-108)

13 files modified

include/server/mir/frontend/communicator_report.h (+0/-1)
include/server/mir/shell/application_session.h (+6/-0)
include/server/mir/shell/default_focus_mechanism.h (+2/-2)
include/server/mir/shell/session.h (+5/-0)
include/test/mir_test_doubles/mock_shell_session.h (+3/-0)
include/test/mir_test_doubles/stub_shell_session.h (+8/-0)
src/server/frontend/protobuf_socket_communicator.cpp (+1/-1)
src/server/frontend/socket_messenger.cpp (+7/-4)
src/server/frontend/socket_messenger.h (+6/-1)
src/server/shell/application_session.cpp (+38/-3)
src/server/shell/default_focus_mechanism.cpp (+10/-18)
tests/unit-tests/frontend/test_socket_messenger.cpp (+5/-2)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+30/-76)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1088. By Robert Carr on 2013-09-26

Fix error in relinquish focus

1087. By Robert Carr on 2013-09-26

Merge socket-messenger-reporitng

1086. By Robert Carr on 2013-09-26

Merge development-branch

1085. By Robert Carr on 2013-09-23

Typo

1084. By Robert Carr on 2013-09-23

application_session: Introduce default_surface_locked to dedupe some code

1083. By Robert Carr on 2013-09-23

Merge fix-1226139

1082. By Robert Carr on 2013-09-23

More cleanup

1081. By Robert Carr on 2013-09-23

Merge trunk

1080. By Robert Carr on 2013-09-23

Cleanup

1079. By Robert Carr on 2013-09-20

Mutex for surface