Merge lp:~alan-griffiths/unity-mir/dont-use-SessionManager into lp:unity-mir

[Alan Griffiths]

Remove dependency on mir::shell::SessionManager

Remove dependency on mir::shell::SessionManager

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/145/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Approved, thank you

review: Approve

=== modified file 'src/unity-mir/sessionauthorizer.cpp'
--- src/unity-mir/sessionauthorizer.cpp	2013-08-15 15:15:10 +0000
+++ src/unity-mir/sessionauthorizer.cpp	2013-10-29 10:19:25 +0000
@@ -17,10 +17,9 @@
 #include "sessionauthorizer.h"
 #include "logging.h"
 
-SessionAuthorizer::SessionAuthorizer(std::shared_ptr<mir::shell::SessionManager> const& sessionManager, QObject *parent)
+SessionAuthorizer::SessionAuthorizer(QObject *parent)
     :   QObject(parent)
 {
-    Q_UNUSED(sessionManager)
 }
 
 SessionAuthorizer::~SessionAuthorizer()

=== modified file 'src/unity-mir/sessionauthorizer.h'
--- src/unity-mir/sessionauthorizer.h	2013-09-26 09:48:22 +0000
+++ src/unity-mir/sessionauthorizer.h	2013-10-29 10:19:25 +0000
@@ -22,7 +22,6 @@
 
 // mir
 #include <mir/frontend/session_authorizer.h>
-#include <mir/shell/session_manager.h>
 
 // Qt
 #include <QObject>
@@ -32,7 +31,7 @@
     Q_OBJECT
 
 public:
-    SessionAuthorizer(std::shared_ptr<mir::shell::SessionManager> const& sessionManager, QObject *parent = 0);
+    SessionAuthorizer(QObject *parent = 0);
     ~SessionAuthorizer();
 
     virtual bool connection_is_allowed(pid_t pid) override;

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2013-10-17 10:30:33 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2013-10-29 10:19:25 +0000
@@ -86,9 +86,9 @@
 ShellServerConfiguration::the_session_authorizer()
 {
     return session_authorizer(
-    [this]()
+    []
     {
-        return std::make_shared<SessionAuthorizer>(the_session_manager());
+        return std::make_shared<SessionAuthorizer>();
     });
 }