Merge lp://qastaging/~ted/url-dispatcher/mediaplayer-app-helper into lp://qastaging/url-dispatcher/15.04

Proposed by Ted Gould
Status: Rejected
Rejected by: Ted Gould
Proposed branch: lp://qastaging/~ted/url-dispatcher/mediaplayer-app-helper
Merge into: lp://qastaging/url-dispatcher/15.04
Diff against target: 442 lines (+286/-5)
12 files modified
CMakeLists.txt (+1/-0)
debian/control (+1/-0)
debian/url-dispatcher.install (+1/-0)
service/CMakeLists.txt (+2/-0)
service/dispatcher.c (+89/-5)
tests/CMakeLists.txt (+4/-0)
tests/manual (+17/-0)
tests/service-test.cc (+41/-0)
tests/test-config.h.in (+2/-0)
tests/ts-helper-test.sh.in (+12/-0)
trusted-session-helper/CMakeLists.txt (+13/-0)
trusted-session-helper/main.cpp (+103/-0)
To merge this branch: bzr merge lp://qastaging/~ted/url-dispatcher/mediaplayer-app-helper
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+245914@code.qastaging.launchpad.net

Commit message

Add special handling for mediaplayer to call the helper instead of an app

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

The code looks very good!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
103. By Ted Gould

Resolving merge conflict with trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

This has been long (3 months) in the train spreadsheet with comment "Cleaned, don't believe it is needed right now.". Please add a new landing line if you want to see this landed.

Unmerged revisions

103. By Ted Gould

Resolving merge conflict with trunk

102. By Ted Gould

Switch back to getting the PID from the DBus Message to work with the camera app

101. By Ted Gould

Make sure to pick up our new binary

100. By Ted Gould

Move define to build

99. By Ted Gould

Merging trunk

98. By Ted Gould

Don't hardcode the utility being called

97. By Ted Gould

Setup a fork/exec relationship so we keep the Mir connection open

96. By Ted Gould

Getting the PID from Upstart

95. By Ted Gould

A test to ensure we call the helper correctly

94. By Ted Gould

Test setup

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches