Merge lp:~nick-dedekind/platform-api/trust-sessions into lp:platform-api

Proposed by kevin gunn
Status: Superseded
Proposed branch: lp:~nick-dedekind/platform-api/trust-sessions
Merge into: lp:platform-api
Diff against target: 36 lines (+5/-3)
2 files modified
debian/control (+2/-2)
src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp (+3/-1)
To merge this branch: bzr merge lp:~nick-dedekind/platform-api/trust-sessions
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+218091@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-17.

To post a comment you must log in.
213. By Nick Dedekind

merged with trunk

214. By Nick Dedekind

updated trust session interface

215. By Nick Dedekind

merged with devel

216. By Nick Dedekind

s/trust/prompt

217. By Nick Dedekind

merged with devel

218. By Nick Dedekind

added override flags

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-06-11 12:19:37 +0000
3+++ debian/control 2014-06-17 09:30:44 +0000
4@@ -10,8 +10,8 @@
5 libgles2-mesa-dev,
6 libhybris-common-dev,
7 pkg-config,
8- libmirclient-dev (>= 0.1.8),
9- libmirserver-dev (>= 0.2.0),
10+ libmirclient-dev (>= 0.1.9),
11+ libmirserver-dev (>= 0.3.0),
12 liburl-dispatcher1-dev,
13 libdbus-1-dev,
14 libdbus-cpp-dev (>= 2.0.0),
15
16=== modified file 'src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp'
17--- src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp 2014-04-15 20:23:07 +0000
18+++ src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp 2014-06-17 09:30:44 +0000
19@@ -58,6 +58,8 @@
20 virtual void show() override {}
21 virtual void send_display_config(mir::graphics::DisplayConfiguration const&) override {}
22
23+ virtual void start_prompt_session() {}
24+ virtual void stop_prompt_session() {}
25 private:
26 std::shared_ptr<ms::Surface> const surface;
27 };
28@@ -77,7 +79,7 @@
29 session_listener(session_listener),
30 ref_count(1)
31 {
32- description = DescriptionPtr(description_,
33+ description = DescriptionPtr(description_,
34 [] (uam::Description* p)
35 {
36 delete p;

Subscribers

People subscribed via source and target branches