lp:~ted/url-dispatcher/url-overlay

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:url-dispatcher/15.10 at revision 86

PS Jenkins bot (community): Approve (continuous-integration) on 2015-06-12

Charles Kerr (community): Approve on 2015-06-11

Diff: 2046 lines (+1506/-41)

34 files modified

CMakeLists.txt (+5/-2)
data/CMakeLists.txt (+7/-2)
data/url-dispatcher.url-overlay.click-hook.in (+3/-0)
debian/control (+2/-1)
debian/rules (+5/-0)
debian/url-dispatcher.install (+1/-0)
service/CMakeLists.txt (+26/-2)
service/dispatcher.c (+96/-13)
service/dispatcher.h (+6/-3)
service/glib-thread.cpp (+179/-0)
service/glib-thread.h (+81/-0)
service/overlay-tracker-iface.h (+26/-0)
service/overlay-tracker-mir.cpp (+153/-0)
service/overlay-tracker-mir.h (+49/-0)
service/overlay-tracker.cpp (+54/-0)
service/overlay-tracker.h (+28/-0)
service/recoverable-problem.c (+6/-0)
service/service.c (+3/-1)
service/url-db.c (+1/-1)
service/url-db.h (+1/-1)
service/url-overlay.c (+174/-0)
tests/CMakeLists.txt (+47/-1)
tests/app-id-test.cc (+3/-1)
tests/dispatcher-test.cc (+25/-1)
tests/exec-tool-test.cc (+118/-0)
tests/mir-mock.cpp (+124/-0)
tests/mir-mock.h (+36/-0)
tests/overlay-dir/com.test.good_application_1.2.3.desktop (+2/-0)
tests/overlay-tracker-mock.h (+30/-0)
tests/overlay-tracker-test.cpp (+127/-0)
tests/service-test.cc (+3/-8)
tests/test-config.h.in (+4/-0)
tests/ubuntu-app-launch-mock.c (+67/-2)
tests/ubuntu-app-launch-mock.h (+14/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

138. By Ted Gould on 2015-06-12

Clean up a couple of warnings

137. By Ted Gould on 2015-06-11

Making internal functions private

136. By Ted Gould on 2015-06-11

Remove (void) as a function prototype

135. By Ted Gould on 2015-06-11

Switch linking option to not include the pthread library, but instead ask for it directly

134. By Ted Gould on 2015-06-08

Allow dir to be NULL

133. By Ted Gould on 2015-06-08

Fixing the dispatcher test to match the fixes in the exec tool test

132. By Ted Gould on 2015-06-08

Make the exec-tool test work with the directory feature (and test it)

131. By Ted Gould on 2015-06-08

Grab Upstart dep

130. By Ted Gould on 2015-06-05

Add the libclick dev package

129. By Ted Gould on 2015-06-05

Adding in directory support for the new UAL