unity-mir

Merge lp:unity-mir/devel-mir-next into lp:unity-mir

  1. devel-mir-next
  2. Merge into trunk
Proposed by Cemil Azizoglu
Status: Merged
Approved by: kevin gunn
Approved revision: 239
Merged at revision: 242
Proposed branch: lp:unity-mir/devel-mir-next
Merge into: lp:unity-mir
Diff against target: 51 lines (+15/-2)
3 files modified
debian/control (+2/-2)
src/unity-mir/sessionauthorizer.cpp (+11/-0)
src/unity-mir/sessionauthorizer.h (+2/-0)
To merge this branch: bzr merge lp:unity-mir/devel-mir-next
Reviewer Review Type Date Requested Status
kevin gunn (community) Approve
Review via email: mp+226836@code.launchpad.net

Commit message

Mir display server 0.5.0 release.

Description of the change

Mir display server 0.5.0 release.

To post a comment you must log in.
Revision history for this message
kevin gunn (kgunn72) wrote :

lgtm

review: Approve
lp:unity-mir/devel-mir-next updated
240. By Robert Carr

Update for mir 0,5

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-27 01:05:20 +0000
3+++ debian/control 2014-07-15 22:24:27 +0000
4@@ -9,8 +9,8 @@
5 libboost-dev,
6 libboost-system-dev,
7 libubuntu-application-api-dev (>= 2.0.0),
8- libmirserver-dev (>= 0.4.0),
9- libmirclient-dev (>= 0.4.0),
10+ libmirserver-dev (>= 0.5.0),
11+ libmirclient-dev (>= 0.5.0),
12 libprocess-cpp-dev,
13 libunity-api-dev (>= 7.80.6),
14 libubuntu-app-launch2-dev,
15
16=== modified file 'src/unity-mir/sessionauthorizer.cpp'
17--- src/unity-mir/sessionauthorizer.cpp 2014-05-08 03:50:31 +0000
18+++ src/unity-mir/sessionauthorizer.cpp 2014-07-15 22:24:27 +0000
19@@ -50,8 +50,19 @@
20
21 bool SessionAuthorizer::screencast_is_allowed(mf::SessionCredentials const& creds)
22 {
23+ //FIXME Actually mediate this access for clients
24 DLOG("SessionAuthorizer::screencast_is_allowed (this=%p, pid=%d)", this, creds.pid());
25 Q_UNUSED(creds)
26 return true;
27 }
28
29+bool SessionAuthorizer::prompt_session_is_allowed(mf::SessionCredentials const& creds)
30+{
31+ //FIXME Actually mediate this access for clients
32+ DLOG("SessionAuthorizer::prompt_session_is_allowed (this=%p, pid=%d)", this, creds.pid());
33+ Q_UNUSED(creds)
34+ return true;
35+}
36+
37+
38+
39
40=== modified file 'src/unity-mir/sessionauthorizer.h'
41--- src/unity-mir/sessionauthorizer.h 2014-05-08 03:50:31 +0000
42+++ src/unity-mir/sessionauthorizer.h 2014-07-15 22:24:27 +0000
43@@ -37,6 +37,8 @@
44 virtual bool connection_is_allowed(mir::frontend::SessionCredentials const& creds) override;
45 virtual bool configure_display_is_allowed(mir::frontend::SessionCredentials const& creds) override;
46 virtual bool screencast_is_allowed(mir::frontend::SessionCredentials const& creds) override;
47+ virtual bool prompt_session_is_allowed(mir::frontend::SessionCredentials const& creds) override;
48+
49
50 Q_SIGNALS:
51 // needs to be blocked queued signal which returns value for authorized

Subscribers

People subscribed via source and target branches