Mir

Merge lp:~alan-griffiths/mir/tidy-code into lp:mir

Proposed by Alan Griffiths on 2017-09-07
Status: Superseded
Proposed branch: lp:~alan-griffiths/mir/tidy-code
Merge into: lp:mir
Prerequisite: lp:~raof/mir/waylanding-again
Diff against target: 53 lines (+42/-0) (has conflicts)
1 file modified
src/server/frontend/wayland/wayland_default_configuration.cpp (+42/-0)
Text conflict in src/server/frontend/wayland/wayland_default_configuration.cpp
To merge this branch: bzr merge lp:~alan-griffiths/mir/tidy-code
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-09-07
Mir development team 2017-09-07 Pending
Review via email: mp+330374@code.launchpad.net

This proposal has been superseded by a proposal from 2017-09-07.

Commit message

Make correct use of frontend::DisplayChanger interface

To post a comment you must log in.
lp:~alan-griffiths/mir/tidy-code updated on 2017-09-07
4246. By Alan Griffiths on 2017-09-07

merge --weave :parent

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4245
https://mir-jenkins.ubuntu.com/job/mir-ci/3642/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4982
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5210
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5198
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5198
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5198
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5021/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5021
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5021/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3642/rebuild

review: Approve (continuous-integration)
lp:~alan-griffiths/mir/tidy-code updated on 2017-09-11
4247. By Alan Griffiths on 2017-09-11

merge :parent

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/frontend/wayland/wayland_default_configuration.cpp'
2--- src/server/frontend/wayland/wayland_default_configuration.cpp 2017-09-07 00:33:58 +0000
3+++ src/server/frontend/wayland/wayland_default_configuration.cpp 2017-09-07 16:45:58 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 /*
7 * Copyright © 2015, 2017 Canonical Ltd.
8 *
9@@ -37,3 +38,44 @@
10 });
11 }
12
13+=======
14+/*
15+ * Copyright © 2015, 2017 Canonical Ltd.
16+ *
17+ * This program is free software: you can redistribute it and/or modify it
18+ * under the terms of the GNU General Public License version 2 or 3,
19+ * as published by the Free Software Foundation.
20+ *
21+ * This program is distributed in the hope that it will be useful,
22+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
23+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24+ * GNU General Public License for more details.
25+ *
26+ * You should have received a copy of the GNU General Public License
27+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
28+ *
29+ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
30+ */
31+
32+#include "mir/default_server_configuration.h"
33+#include "wayland_connector.h"
34+
35+#include "mir/frontend/display_changer.h"
36+#include "mir/graphics/platform.h"
37+
38+namespace mf = mir::frontend;
39+
40+std::shared_ptr<mf::Connector>
41+ mir::DefaultServerConfiguration::the_wayland_connector()
42+{
43+ return wayland_connector(
44+ [this]() -> std::shared_ptr<mf::Connector>
45+ {
46+ return std::make_shared<mf::WaylandConnector>(
47+ the_frontend_shell(),
48+ *the_frontend_display_changer(),
49+ the_buffer_allocator());
50+ });
51+}
52+
53+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches