unity-mir

Merge lp:~gerboland/unity-mir/0.1.2-supprt into lp:unity-mir

  1. 0.1.2-supprt
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 149
Merged at revision: 151
Proposed branch: lp:~gerboland/unity-mir/0.1.2-supprt
Merge into: lp:unity-mir
Diff against target: 48 lines (+4/-5)
3 files modified
src/modules/Unity/Application/applicationscreenshotprovider.cpp (+1/-1)
src/unity-mir/shellserverconfiguration.cpp (+0/-1)
src/unity-mir/surfacefactory.cpp (+3/-3)
To merge this branch: bzr merge lp:~gerboland/unity-mir/0.1.2-supprt
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+196693@code.launchpad.net

Commit message

Misc fixes for Mir 0.1.2 support

Description of the change

Misc fixes for Mir 0.1.2 support

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

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/165/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/applicationscreenshotprovider.cpp'
2--- src/modules/Unity/Application/applicationscreenshotprovider.cpp 2013-09-27 15:12:56 +0000
3+++ src/modules/Unity/Application/applicationscreenshotprovider.cpp 2013-11-26 11:03:17 +0000
4@@ -23,7 +23,7 @@
5 #include "logging.h"
6
7 // mir
8-#include "mirserver/mir/shell/application_session.h"
9+#include "mirserver/mir/shell/session.h"
10
11 // fallback grid unit used if GRID_UNIT_PX is not in the environment.
12 const int defaultGridUnitPx = 8;
13
14=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
15--- src/unity-mir/shellserverconfiguration.cpp 2013-11-08 17:54:50 +0000
16+++ src/unity-mir/shellserverconfiguration.cpp 2013-11-26 11:03:17 +0000
17@@ -25,7 +25,6 @@
18 #include "logging.h"
19
20 namespace msh = mir::shell;
21-namespace ms = mir::surfaces;
22
23 ShellServerConfiguration::ShellServerConfiguration(int argc, char const* argv[], QObject* parent)
24 : QObject(parent)
25
26=== modified file 'src/unity-mir/surfacefactory.cpp'
27--- src/unity-mir/surfacefactory.cpp 2013-11-14 14:01:54 +0000
28+++ src/unity-mir/surfacefactory.cpp 2013-11-26 11:03:17 +0000
29@@ -22,7 +22,7 @@
30 #include <mir/shell/surface_creation_parameters.h>
31
32 namespace msh = mir::shell;
33-namespace ms = mir::surfaces;
34+namespace msc = mir::scene;
35
36 SurfaceFactory::SurfaceFactory(std::shared_ptr<mir::shell::SurfaceFactory> const& surfaceFactory,
37 QObject *parent)
38@@ -44,8 +44,8 @@
39 std::shared_ptr<mir::frontend::EventSink> const& sink)
40 {
41 DLOG("SurfaceFactory::create_surface");
42- static const ms::DepthId shellSurfaceDepth{1};
43- static const ms::DepthId oskSurfaceDepth{2};
44+ static const msc::DepthId shellSurfaceDepth{1};
45+ static const msc::DepthId oskSurfaceDepth{2};
46 static bool shellSurfaceFound = false; //FIXME: Hack to work around fact unable to detect shell surface
47
48 std::shared_ptr<msh::Surface> mirSurface;

Subscribers

People subscribed via source and target branches