Mir

Merge lp:~alan-griffiths/mir/urgent-fix-unity-mir-build into lp:~mir-team/mir/v0.1.1

  1. urgent-fix-unity-mir-build
  2. Merge into v0.1.1
Proposed by Alan Griffiths
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 1165
Proposed branch: lp:~alan-griffiths/mir/urgent-fix-unity-mir-build
Merge into: lp:~mir-team/mir/v0.1.1
Diff against target: 53 lines (+4/-4)
4 files modified
include/test/mir_test_doubles/mock_focus_setter.h (+1/-1)
src/server/shell/default_focus_mechanism.h (+1/-1)
src/server/shell/session_manager.cpp (+1/-1)
tests/integration-tests/shell/test_session_manager.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/urgent-fix-unity-mir-build
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve
Review via email: mp+195232@code.launchpad.net

Commit message

shell: restore shell/focus_setter.h as a public header

Description of the change

shell: restore shell/focus_setter.h as a public header

(It was used by unity-mir, but unfortunately not documented as such.)

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good, unity-mir builds fine locally with this change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'src/server/shell/focus_setter.h' => 'include/server/mir/shell/focus_setter.h'
2=== modified file 'include/test/mir_test_doubles/mock_focus_setter.h'
3--- include/test/mir_test_doubles/mock_focus_setter.h 2013-11-06 03:17:35 +0000
4+++ include/test/mir_test_doubles/mock_focus_setter.h 2013-11-14 14:43:46 +0000
5@@ -19,7 +19,7 @@
6 #ifndef MIR_TEST_DOUBLES_MOCK_FOCUS_SETTER_H_
7 #define MIR_TEST_DOUBLES_MOCK_FOCUS_SETTER_H_
8
9-#include "src/server/shell/focus_setter.h"
10+#include "mir/shell/focus_setter.h"
11
12 #include <gmock/gmock.h>
13
14
15=== modified file 'src/server/shell/default_focus_mechanism.h'
16--- src/server/shell/default_focus_mechanism.h 2013-11-06 03:17:35 +0000
17+++ src/server/shell/default_focus_mechanism.h 2013-11-14 14:43:46 +0000
18@@ -19,7 +19,7 @@
19 #ifndef MIR_SHELL_SINGLE_VISIBILITY_FOCUS_MECHANISM_H_
20 #define MIR_SHELL_SINGLE_VISIBILITY_FOCUS_MECHANISM_H_
21
22-#include "focus_setter.h"
23+#include "mir/shell/focus_setter.h"
24
25 #include <memory>
26 #include <mutex>
27
28=== modified file 'src/server/shell/session_manager.cpp'
29--- src/server/shell/session_manager.cpp 2013-11-06 03:17:35 +0000
30+++ src/server/shell/session_manager.cpp 2013-11-14 14:43:46 +0000
31@@ -21,7 +21,7 @@
32 #include "mir/shell/session_container.h"
33 #include "mir/shell/surface_factory.h"
34 #include "focus_sequence.h"
35-#include "focus_setter.h"
36+#include "mir/shell/focus_setter.h"
37 #include "mir/shell/session.h"
38 #include "mir/shell/surface.h"
39 #include "mir/shell/session_listener.h"
40
41=== modified file 'tests/integration-tests/shell/test_session_manager.cpp'
42--- tests/integration-tests/shell/test_session_manager.cpp 2013-11-06 03:17:35 +0000
43+++ tests/integration-tests/shell/test_session_manager.cpp 2013-11-14 14:43:46 +0000
44@@ -18,8 +18,8 @@
45
46 #include "mir/shell/session_manager.h"
47 #include "mir/shell/session.h"
48-#include "src/server/shell/focus_setter.h"
49 #include "src/server/shell/registration_order_focus_sequence.h"
50+#include "mir/shell/focus_setter.h"
51 #include "src/server/shell/default_session_container.h"
52 #include "mir/shell/null_session_listener.h"
53 #include "mir/compositor/buffer_stream.h"

Subscribers

People subscribed via source and target branches