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

Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 138
Merged at revision: 138
Proposed branch: lp:~alan-griffiths/unity-mir/dont-use-SessionManager
Merge into: lp:unity-mir
Diff against target: 51 lines (+4/-6)
3 files modified
src/unity-mir/sessionauthorizer.cpp (+1/-2)
src/unity-mir/sessionauthorizer.h (+1/-2)
src/unity-mir/shellserverconfiguration.cpp (+2/-2)
To merge this branch: bzr merge lp:~alan-griffiths/unity-mir/dont-use-SessionManager
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+193032@code.launchpad.net

Commit message

Remove dependency on mir::shell::SessionManager

Description of the change

Remove dependency on mir::shell::SessionManager

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Approved, thank you

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-mir/sessionauthorizer.cpp'
2--- src/unity-mir/sessionauthorizer.cpp 2013-08-15 15:15:10 +0000
3+++ src/unity-mir/sessionauthorizer.cpp 2013-10-29 10:19:25 +0000
4@@ -17,10 +17,9 @@
5 #include "sessionauthorizer.h"
6 #include "logging.h"
7
8-SessionAuthorizer::SessionAuthorizer(std::shared_ptr<mir::shell::SessionManager> const& sessionManager, QObject *parent)
9+SessionAuthorizer::SessionAuthorizer(QObject *parent)
10 : QObject(parent)
11 {
12- Q_UNUSED(sessionManager)
13 }
14
15 SessionAuthorizer::~SessionAuthorizer()
16
17=== modified file 'src/unity-mir/sessionauthorizer.h'
18--- src/unity-mir/sessionauthorizer.h 2013-09-26 09:48:22 +0000
19+++ src/unity-mir/sessionauthorizer.h 2013-10-29 10:19:25 +0000
20@@ -22,7 +22,6 @@
21
22 // mir
23 #include <mir/frontend/session_authorizer.h>
24-#include <mir/shell/session_manager.h>
25
26 // Qt
27 #include <QObject>
28@@ -32,7 +31,7 @@
29 Q_OBJECT
30
31 public:
32- SessionAuthorizer(std::shared_ptr<mir::shell::SessionManager> const& sessionManager, QObject *parent = 0);
33+ SessionAuthorizer(QObject *parent = 0);
34 ~SessionAuthorizer();
35
36 virtual bool connection_is_allowed(pid_t pid) override;
37
38=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
39--- src/unity-mir/shellserverconfiguration.cpp 2013-10-17 10:30:33 +0000
40+++ src/unity-mir/shellserverconfiguration.cpp 2013-10-29 10:19:25 +0000
41@@ -86,9 +86,9 @@
42 ShellServerConfiguration::the_session_authorizer()
43 {
44 return session_authorizer(
45- [this]()
46+ []
47 {
48- return std::make_shared<SessionAuthorizer>(the_session_manager());
49+ return std::make_shared<SessionAuthorizer>();
50 });
51 }
52

Subscribers

People subscribed via source and target branches