1
=== modified file 'tests/mir-mock.cpp'
2
--- tests/mir-mock.cpp	2015-06-12 15:40:29 +0000
3
+++ tests/mir-mock.cpp	2017-03-16 17:01:01 +0000
4
@@ -52,7 +52,7 @@
5
52
}
52
}
6
53
53
7
54
MirWaitHandle *
54
MirWaitHandle *
9
55
mir_prompt_session_new_fds_for_prompt_providers (MirPromptSession * session, unsigned int numfds, mir_client_fd_callback cb, void * data) {
55
mir_prompt_session_new_fds_for_prompt_providers (MirPromptSession * session, unsigned int numfds, MirClientFdCallback cb, void * data) {
10
56
	if (session != mir_mock_valid_trust_session) {
56
	if (session != mir_mock_valid_trust_session) {
11
57
		std::cerr << "Releasing a Mir Trusted Prompt that isn't valid" << std::endl;
57
		std::cerr << "Releasing a Mir Trusted Prompt that isn't valid" << std::endl;
12
58
		exit(1);
58
		exit(1);
Status:	Merged
Approved by:	Ted Gould on 2017-03-16
Approved revision:	114
Merged at revision:	117
Proposed branch:	lp:~dobey/url-dispatcher/fix-mir-mock
Merge into:	lp:url-dispatcher
Diff against target:	12 lines (+1/-1) 1 file modified tests/mir-mock.cpp (+1/-1)
To merge this branch:	bzr merge lp:~dobey/url-dispatcher/fix-mir-mock
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2017-03-16	Approve on 2017-03-16
unity-api-1-bot	continuous-integration		Needs Fixing on 2017-03-16
Review via email: mp+320089@code.launchpad.net
1	=== modified file 'tests/mir-mock.cpp'
2	--- tests/mir-mock.cpp 2015-06-12 15:40:29 +0000
3	+++ tests/mir-mock.cpp 2017-03-16 17:01:01 +0000
4	@@ -52,7 +52,7 @@
5	52	}	52	}
6	53		53
7	54	MirWaitHandle *	54	MirWaitHandle *
9	55	mir_prompt_session_new_fds_for_prompt_providers (MirPromptSession * session, unsigned int numfds, mir_client_fd_callback cb, void * data) {	55	mir_prompt_session_new_fds_for_prompt_providers (MirPromptSession * session, unsigned int numfds, MirClientFdCallback cb, void * data) {
10	56	if (session != mir_mock_valid_trust_session) {	56	if (session != mir_mock_valid_trust_session) {
11	57	std::cerr << "Releasing a Mir Trusted Prompt that isn't valid" << std::endl;	57	std::cerr << "Releasing a Mir Trusted Prompt that isn't valid" << std::endl;
12	58	exit(1);	58	exit(1);