unity-mir

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

  1. devel-mir-next
  2. Merge into trunk
Proposed by kevin gunn
Status: Merged
Merged at revision: 229
Proposed branch: lp:unity-mir/devel-mir-next
Merge into: lp:unity-mir
Diff against target: 197 lines (+33/-23)
9 files modified
debian/control (+1/-1)
src/unity-mir/messageprocessor.cpp (+5/-0)
src/unity-mir/messageprocessor.h (+1/-0)
src/unity-mir/sessionauthorizer.cpp (+13/-9)
src/unity-mir/sessionauthorizer.h (+3/-3)
src/unity-mir/sessioncreator.cpp (+3/-3)
src/unity-mir/sessioncreator.h (+3/-3)
src/unity-mir/shellserverconfiguration.cpp (+3/-3)
src/unity-mir/shellserverconfiguration.h (+1/-1)
To merge this branch: bzr merge lp:unity-mir/devel-mir-next
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Cemil Azizoglu Pending
Review via email: mp+220688@code.launchpad.net

Commit message

0.2.0 mir stage

Description of the change

0.2.0 mir stage

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/367/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/367/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/370/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/34/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/370/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/373/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/37/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/373/rebuild

review: Needs Fixing (continuous-integration)
lp:unity-mir/devel-mir-next updated
229. By Tarmac

0.2.0 mir stage

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-05-26 06:17:14 +0000
3+++ debian/control 2014-06-05 01:04:01 +0000
4@@ -9,7 +9,7 @@
5 libboost-dev,
6 libboost-system-dev,
7 libplatform-api1-dev,
8- libmirserver-dev (>= 0.1.9),
9+ libmirserver-dev (>= 0.2.0),
10 libmirclient-dev (>= 0.1.8),
11 libprocess-cpp-dev,
12 libunity-api-dev (>= 7.80.6),
13
14=== modified file 'src/unity-mir/messageprocessor.cpp'
15--- src/unity-mir/messageprocessor.cpp 2014-02-06 12:12:21 +0000
16+++ src/unity-mir/messageprocessor.cpp 2014-06-05 01:04:01 +0000
17@@ -39,6 +39,11 @@
18 }
19 }
20
21+void MessageProcessor::client_pid(int pid)
22+{
23+ m_wrapped->client_pid(pid);
24+}
25+
26 void MessageProcessor::send_response(::google::protobuf::uint32 id, ::google::protobuf::Message* response)
27 {
28 m_sender->send_response(id, response, {});
29
30=== modified file 'src/unity-mir/messageprocessor.h'
31--- src/unity-mir/messageprocessor.h 2014-02-06 12:12:21 +0000
32+++ src/unity-mir/messageprocessor.h 2014-06-05 01:04:01 +0000
33@@ -33,6 +33,7 @@
34 m_unityService(unityService) {}
35
36 bool dispatch(mir::frontend::detail::Invocation const& invocation);
37+ void client_pid(int pid);
38
39 void send_response(::google::protobuf::uint32 id, ::google::protobuf::Message* response);
40
41
42=== modified file 'src/unity-mir/sessionauthorizer.cpp'
43--- src/unity-mir/sessionauthorizer.cpp 2014-03-27 14:22:08 +0000
44+++ src/unity-mir/sessionauthorizer.cpp 2014-06-05 01:04:01 +0000
45@@ -17,6 +17,10 @@
46 #include "sessionauthorizer.h"
47 #include "logging.h"
48
49+#include <mir/frontend/session_credentials.h>
50+
51+namespace mf = mir::frontend;
52+
53 SessionAuthorizer::SessionAuthorizer(QObject *parent)
54 : QObject(parent)
55 {
56@@ -26,28 +30,28 @@
57 {
58 }
59
60-bool SessionAuthorizer::connection_is_allowed(pid_t pid)
61+bool SessionAuthorizer::connection_is_allowed(mf::SessionCredentials const& creds)
62 {
63- DLOG("SessionAuthorizer::connection_is_allowed (this=%p, pid=%d", this, pid);
64+ DLOG("SessionAuthorizer::connection_is_allowed (this=%p, pid=%d", this, creds.pid());
65 bool authorized = true;
66
67- Q_EMIT requestAuthorizationForSession(pid, authorized); // needs to block until authorized value returned
68+ Q_EMIT requestAuthorizationForSession(creds.pid(), authorized); // needs to block until authorized value returned
69 return authorized;
70 }
71
72-bool SessionAuthorizer::configure_display_is_allowed(pid_t pid)
73+bool SessionAuthorizer::configure_display_is_allowed(mf::SessionCredentials const& creds)
74 {
75- DLOG("SessionAuthorizer::configure_display_is_allowed (this=%p, pid=%d)", this, pid);
76+ DLOG("SessionAuthorizer::configure_display_is_allowed (this=%p, pid=%d)", this, creds.pid());
77
78 //FIXME(ricmm) Actually mediate this access for clients
79- Q_UNUSED(pid)
80+ Q_UNUSED(creds)
81 return true;
82 }
83
84-bool SessionAuthorizer::screencast_is_allowed(pid_t pid)
85+bool SessionAuthorizer::screencast_is_allowed(mf::SessionCredentials const& creds)
86 {
87- DLOG("SessionAuthorizer::screencast_is_allowed (this=%p, pid=%d)", this, pid);
88- Q_UNUSED(pid)
89+ DLOG("SessionAuthorizer::screencast_is_allowed (this=%p, pid=%d)", this, creds.pid());
90+ Q_UNUSED(creds)
91 return true;
92 }
93
94
95=== modified file 'src/unity-mir/sessionauthorizer.h'
96--- src/unity-mir/sessionauthorizer.h 2014-03-27 14:22:08 +0000
97+++ src/unity-mir/sessionauthorizer.h 2014-06-05 01:04:01 +0000
98@@ -34,9 +34,9 @@
99 SessionAuthorizer(QObject *parent = 0);
100 ~SessionAuthorizer();
101
102- virtual bool connection_is_allowed(pid_t pid) override;
103- virtual bool configure_display_is_allowed(pid_t pid) override;
104- virtual bool screencast_is_allowed(pid_t pid) override;
105+ virtual bool connection_is_allowed(mir::frontend::SessionCredentials const& creds) override;
106+ virtual bool configure_display_is_allowed(mir::frontend::SessionCredentials const& creds) override;
107+ virtual bool screencast_is_allowed(mir::frontend::SessionCredentials const& creds) override;
108
109 Q_SIGNALS:
110 // needs to be blocked queued signal which returns value for authorized
111
112=== modified file 'src/unity-mir/sessioncreator.cpp'
113--- src/unity-mir/sessioncreator.cpp 2014-02-06 12:12:21 +0000
114+++ src/unity-mir/sessioncreator.cpp 2014-06-05 01:04:01 +0000
115@@ -22,17 +22,17 @@
116 std::shared_ptr<mir::frontend::ProtobufIpcFactory> const& ipc_factory,
117 std::shared_ptr<mir::frontend::SessionAuthorizer> const& session_authorizer,
118 std::shared_ptr<mir::frontend::MessageProcessorReport> const& report)
119- : ProtobufSessionCreator(ipc_factory, session_authorizer, report)
120+ : ProtobufConnectionCreator(ipc_factory, session_authorizer, report)
121 , m_unityService(unityService)
122 {
123 }
124
125 std::shared_ptr<mir::frontend::detail::MessageProcessor> SessionCreator::create_processor(
126 std::shared_ptr<mir::frontend::detail::ProtobufMessageSender> const& sender,
127- std::shared_ptr<mir::protobuf::DisplayServer> const& display_server,
128+ std::shared_ptr<mir::frontend::detail::DisplayServer> const& display_server,
129 std::shared_ptr<mir::frontend::MessageProcessorReport> const& report) const
130 {
131- auto const wrapped = mir::frontend::ProtobufSessionCreator::create_processor(
132+ auto const wrapped = mir::frontend::ProtobufConnectionCreator::create_processor(
133 sender,
134 display_server,
135 report);
136
137=== modified file 'src/unity-mir/sessioncreator.h'
138--- src/unity-mir/sessioncreator.h 2014-02-06 12:12:21 +0000
139+++ src/unity-mir/sessioncreator.h 2014-06-05 01:04:01 +0000
140@@ -17,7 +17,7 @@
141 #ifndef SESSIONCREATOR_H
142 #define SESSIONCREATOR_H
143
144-#include <mir/frontend/protobuf_session_creator.h>
145+#include <mir/frontend/protobuf_connection_creator.h>
146
147 namespace unity {
148 namespace protobuf {
149@@ -25,7 +25,7 @@
150 }
151 }
152
153-class SessionCreator : public mir::frontend::ProtobufSessionCreator
154+class SessionCreator : public mir::frontend::ProtobufConnectionCreator
155 {
156 public:
157 SessionCreator(
158@@ -36,7 +36,7 @@
159
160 std::shared_ptr<mir::frontend::detail::MessageProcessor> create_processor(
161 std::shared_ptr<mir::frontend::detail::ProtobufMessageSender> const& sender,
162- std::shared_ptr<mir::protobuf::DisplayServer> const& display_server,
163+ std::shared_ptr<mir::frontend::detail::DisplayServer> const& display_server,
164 std::shared_ptr<mir::frontend::MessageProcessorReport> const& report) const override;
165 private:
166 std::shared_ptr<unity::protobuf::UnityService> m_unityService;
167
168=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
169--- src/unity-mir/shellserverconfiguration.cpp 2014-04-15 14:31:02 +0000
170+++ src/unity-mir/shellserverconfiguration.cpp 2014-06-05 01:04:01 +0000
171@@ -94,10 +94,10 @@
172 });
173 }
174
175-std::shared_ptr<mir::frontend::SessionCreator>
176-ShellServerConfiguration::the_session_creator()
177+std::shared_ptr<mir::frontend::ConnectionCreator>
178+ShellServerConfiguration::the_connection_creator()
179 {
180- return session_creator([this]
181+ return connection_creator([this]
182 {
183 return std::make_shared<SessionCreator>(
184 m_unityService,
185
186=== modified file 'src/unity-mir/shellserverconfiguration.h'
187--- src/unity-mir/shellserverconfiguration.h 2014-04-15 14:31:02 +0000
188+++ src/unity-mir/shellserverconfiguration.h 2014-06-05 01:04:01 +0000
189@@ -52,7 +52,7 @@
190 std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
191 std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
192 std::shared_ptr<mir::frontend::SessionAuthorizer> the_session_authorizer() override;
193- std::shared_ptr<mir::frontend::SessionCreator> the_session_creator() override;
194+ std::shared_ptr<mir::frontend::ConnectionCreator> the_connection_creator() override;
195
196 /* qt specific */
197 // getters

Subscribers

People subscribed via source and target branches