Merge lp:~andreas-pokorny/unity-system-compositor/server-status-listener into lp:unity-system-compositor

Proposed by Andreas Pokorny
Status: Work in progress
Proposed branch: lp:~andreas-pokorny/unity-system-compositor/server-status-listener
Merge into: lp:unity-system-compositor
Diff against target: 32 lines (+14/-0)
2 files modified
debian/changelog (+6/-0)
src/server.cpp (+8/-0)
To merge this branch: bzr merge lp:~andreas-pokorny/unity-system-compositor/server-status-listener
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Unity System Compositor Development Team Pending
Review via email: mp+305700@code.launchpad.net

Commit message

changes for test silo

Description of the change

lp:mir related changes

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

301. By Andreas Pokorny

changes for mir test silo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-06-09 08:36:48 +0000
3+++ debian/changelog 2016-09-14 11:54:28 +0000
4@@ -1,3 +1,9 @@
5+unity-system-compositor (0.6.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * changes for mir test silo
8+
9+ -- Andreas Pokorny <andreas.pokorny@canonical.com> Wed, 14 Sep 2016 13:51:09 +0200
10+
11 unity-system-compositor (0.6.0-0ubuntu1) yakkety; urgency=medium
12
13 * Update for compatibility with repowerd.
14
15=== modified file 'src/server.cpp'
16--- src/server.cpp 2016-06-09 08:32:32 +0000
17+++ src/server.cpp 2016-09-14 11:54:28 +0000
18@@ -99,6 +99,14 @@
19 {
20 }
21
22+ void ready_for_user_input() override
23+ {
24+ }
25+
26+ void stop_receiving_input() override
27+ {
28+ }
29+
30 std::weak_ptr<ms::Session> weak_active_session()
31 {
32 return focus_controller->focused_session();

Subscribers

People subscribed via source and target branches