QtMir

Merge lp:~nick-dedekind/qtmir/mir-0.5-compatibility into lp:qtmir

  1. mir-0.5-compatibility
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Merged at revision: 207
Proposed branch: lp:~nick-dedekind/qtmir/mir-0.5-compatibility
Merge into: lp:qtmir
Diff against target: 28 lines (+10/-0)
2 files modified
src/platforms/mirserver/sessionauthorizer.cpp (+9/-0)
src/platforms/mirserver/sessionauthorizer.h (+1/-0)
To merge this branch: bzr merge lp:~nick-dedekind/qtmir/mir-0.5-compatibility
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+227290@code.launchpad.net

Commit message

Compatibility with mir-0.5

Description of the change

Compatibility with mir-0.5

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Approved, and merged at revision 207

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mirserver/sessionauthorizer.cpp'
2--- src/platforms/mirserver/sessionauthorizer.cpp 2014-07-01 13:38:06 +0000
3+++ src/platforms/mirserver/sessionauthorizer.cpp 2014-07-18 08:54:01 +0000
4@@ -57,3 +57,12 @@
5 Q_UNUSED(creds)
6 return true;
7 }
8+
9+bool SessionAuthorizer::prompt_session_is_allowed(SessionCredentials const& creds)
10+{
11+ qCDebug(QTMIR_MIR_MESSAGES) << "SessionAuthorizer::prompt_session_is_allowed - this=" << this << "pid=" << creds.pid();
12+
13+ //FIXME Actually mediate this access for clients
14+ Q_UNUSED(creds)
15+ return true;
16+}
17
18=== modified file 'src/platforms/mirserver/sessionauthorizer.h'
19--- src/platforms/mirserver/sessionauthorizer.h 2014-05-09 16:25:00 +0000
20+++ src/platforms/mirserver/sessionauthorizer.h 2014-07-18 08:54:01 +0000
21@@ -37,6 +37,7 @@
22 bool connection_is_allowed(mir::frontend::SessionCredentials const& creds) override;
23 bool configure_display_is_allowed(mir::frontend::SessionCredentials const& creds) override;
24 bool screencast_is_allowed(mir::frontend::SessionCredentials const& creds) override;
25+ bool prompt_session_is_allowed(mir::frontend::SessionCredentials const& creds) override;
26
27 Q_SIGNALS:
28 // needs to be blocked queued signal which returns value for authorized

Subscribers

People subscribed via source and target branches