Mir

Merge lp:~alan-griffiths/mir/fix-bug-1156543 into lp:~mir-team/mir/trunk

  1. fix-bug-1156543
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Martin Mrazik
Approved revision: no longer in the source branch.
Merged at revision: 508
Proposed branch: lp:~alan-griffiths/mir/fix-bug-1156543
Merge into: lp:~mir-team/mir/trunk
Diff against target: 14 lines (+3/-2)
1 file modified
src/server/input/dummy_input_manager.cpp (+3/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-bug-1156543
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Carr (community) Approve
Review via email: mp+153740@code.launchpad.net

Commit message

input: Add missing stub member function to DummyInputManager

Description of the change

input: Add missing stub member function to DummyInputManager

Fixes build error when IR_DISABLE_INPUT is set

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/mir-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/111/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/111/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/110/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Carr (robertcarr) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/52/
Executed test runs:

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Re-approving. This was just scheduled when I added an android build to the process and something break in jenkins.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/53/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-autolanding/54/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Sorry :-/ android will need a bit more love. Reverting the config for now and reapproving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/input/dummy_input_manager.cpp'
2--- src/server/input/dummy_input_manager.cpp 2013-03-07 08:04:05 +0000
3+++ src/server/input/dummy_input_manager.cpp 2013-03-18 10:26:23 +0000
4@@ -25,8 +25,9 @@
5 {
6 class DummyInputManager : public mi::InputManager
7 {
8- void stop() {};
9- void start() {};
10+ void stop() {}
11+ void start() {}
12+ virtual std::shared_ptr<mi::InputChannel> make_input_channel() { return std::shared_ptr<mi::InputChannel>(); }
13 };
14 }
15

Subscribers

People subscribed via source and target branches