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

[Nick Dedekind]

Compatibility with mir-0.5

Compatibility with mir-0.5

[Gerry Boland (gerboland)]

Approved, and merged at revision 207

review: Approve

=== modified file 'src/platforms/mirserver/sessionauthorizer.cpp'
--- src/platforms/mirserver/sessionauthorizer.cpp	2014-07-01 13:38:06 +0000
+++ src/platforms/mirserver/sessionauthorizer.cpp	2014-07-18 08:54:01 +0000
@@ -57,3 +57,12 @@
     Q_UNUSED(creds)
     return true;
 }
+
+bool SessionAuthorizer::prompt_session_is_allowed(SessionCredentials const& creds)
+{
+    qCDebug(QTMIR_MIR_MESSAGES) << "SessionAuthorizer::prompt_session_is_allowed - this=" << this << "pid=" << creds.pid();
+
+    //FIXME Actually mediate this access for clients
+    Q_UNUSED(creds)
+    return true;
+}
 
=== modified file 'src/platforms/mirserver/sessionauthorizer.h'
--- src/platforms/mirserver/sessionauthorizer.h	2014-05-09 16:25:00 +0000
+++ src/platforms/mirserver/sessionauthorizer.h	2014-07-18 08:54:01 +0000
@@ -37,6 +37,7 @@
     bool connection_is_allowed(mir::frontend::SessionCredentials const& creds) override;
     bool configure_display_is_allowed(mir::frontend::SessionCredentials const& creds) override;
     bool screencast_is_allowed(mir::frontend::SessionCredentials const& creds) override;
+    bool prompt_session_is_allowed(mir::frontend::SessionCredentials const& creds) override;
 
 Q_SIGNALS:
     // needs to be blocked queued signal which returns value for authorized