unity-mir

Merge lp:~gerboland/unity-mir/fix-FTBFS-mir-951 into lp:unity-mir

  1. fix-FTBFS-mir-951
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 32
Merged at revision: 32
Proposed branch: lp:~gerboland/unity-mir/fix-FTBFS-mir-951
Merge into: lp:unity-mir
Diff against target: 71 lines (+10/-4)
4 files modified
src/unity-mir/surfacebuilder.cpp (+2/-1)
src/unity-mir/surfacebuilder.h (+5/-2)
src/unity-mir/surfacesource.cpp (+2/-1)
src/unity-mir/surfacesource.h (+1/-0)
To merge this branch: bzr merge lp:~gerboland/unity-mir/fix-FTBFS-mir-951
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+179665@code.launchpad.net

Commit message

Fix FTBFS due to Mir commit 951

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-mir/surfacebuilder.cpp'
2--- src/unity-mir/surfacebuilder.cpp 2013-08-09 13:16:13 +0000
3+++ src/unity-mir/surfacebuilder.cpp 2013-08-12 11:16:32 +0000
4@@ -36,9 +36,10 @@
5 DLOG("SurfaceBuilder::~SurfaceBuilder (this=%p)", this);
6 }
7
8-std::weak_ptr<ms::Surface> SurfaceBuilder::create_surface(const msh::SurfaceCreationParameters& params)
9+std::weak_ptr<ms::Surface> SurfaceBuilder::create_surface(mir::shell::Session *session, const msh::SurfaceCreationParameters& params)
10 {
11 DLOG("SurfaceBuilder::~create_surface (this=%p)", this);
12+ Q_UNUSED(session)
13
14 static const ms::DepthId shellSurfaceDepth{1};
15 static bool shellSurfaceFound = false;
16
17=== modified file 'src/unity-mir/surfacebuilder.h'
18--- src/unity-mir/surfacebuilder.h 2013-08-09 13:16:13 +0000
19+++ src/unity-mir/surfacebuilder.h 2013-08-12 11:16:32 +0000
20@@ -19,7 +19,7 @@
21
22 #include <QObject>
23
24-#include "mirserver/mir/shell/surface_builder.h"
25+#include "mir/shell/surface_builder.h"
26
27 namespace mir { namespace surfaces { class SurfaceStackModel; }}
28
29@@ -31,7 +31,10 @@
30 explicit SurfaceBuilder(const std::shared_ptr<mir::surfaces::SurfaceStackModel>& surfaceStack, QObject *parent = 0);
31 ~SurfaceBuilder();
32
33- virtual std::weak_ptr<mir::surfaces::Surface> create_surface(const mir::shell::SurfaceCreationParameters &params) override;
34+ virtual std::weak_ptr<mir::surfaces::Surface> create_surface(
35+ mir::shell::Session* session,
36+ const mir::shell::SurfaceCreationParameters &params) override;
37+
38 virtual void destroy_surface(const std::weak_ptr<mir::surfaces::Surface>& surface) override;
39
40 private:
41
42=== modified file 'src/unity-mir/surfacesource.cpp'
43--- src/unity-mir/surfacesource.cpp 2013-08-09 13:16:13 +0000
44+++ src/unity-mir/surfacesource.cpp 2013-08-12 11:16:32 +0000
45@@ -40,12 +40,13 @@
46
47 std::shared_ptr<msh::Surface>
48 SurfaceSource::create_surface(
49+ mir::shell::Session *session,
50 msh::SurfaceCreationParameters const& params,
51 mir::frontend::SurfaceId id,
52 std::shared_ptr<mir::frontend::EventSink> const& sink)
53 {
54 DLOG("SurfaceSource::create_surface");
55- std::shared_ptr<msh::Surface> mirSurface = msh::SurfaceSource::create_surface(params, id, sink);
56+ std::shared_ptr<msh::Surface> mirSurface = msh::SurfaceSource::create_surface(session, params, id, sink);
57
58 static bool shellSurfaceFound = false; //FIXME: Hack to work around fact unable to detect shell surface
59 if (!shellSurfaceFound) {
60
61=== modified file 'src/unity-mir/surfacesource.h'
62--- src/unity-mir/surfacesource.h 2013-08-09 13:16:13 +0000
63+++ src/unity-mir/surfacesource.h 2013-08-12 11:16:32 +0000
64@@ -36,6 +36,7 @@
65
66 //Called by Mir server
67 std::shared_ptr<mir::shell::Surface> create_surface(
68+ mir::shell::Session* session,
69 mir::shell::SurfaceCreationParameters const& params,
70 mir::frontend::SurfaceId id,
71 std::shared_ptr<mir::frontend::EventSink> const& sink) override;

Subscribers

People subscribed via source and target branches