Merge lp:~mterry/indicator-sound/snap-root into lp:indicator-sound

Proposed by Michael Terry on 2016-10-11
Status: Merged
Approved by: Charles Kerr on 2016-10-11
Approved revision: 540
Merged at revision: 542
Proposed branch: lp:~mterry/indicator-sound/snap-root
Merge into: lp:indicator-sound
Diff against target: 9 lines (+1/-1)
1 file modified
data/indicator-sound.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-sound/snap-root
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing on 2016-10-11
Charles Kerr (community) 2016-10-11 Approve on 2016-10-11
Review via email: mp+308125@code.launchpad.net

Commit message

Work when inside a snap by prefixing hard coded paths with $SNAP.

Description of the change

There are also two hardcoded paths in the data/*.desktop.in files. But that's a static desktop file, so $SNAP isn't appropriate. I think it makes more sense to update the code that reads those files to do the prefixing.

But this, in conjunction with [1], gets indicator-sound to appear in a snappified-unity8 session.

[1] https://code.launchpad.net/~mterry/ubuntu-touch-session/pulse-in-snap/+merge/306662

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

LGTM

review: Approve
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/indicator-sound.conf.in'
--- data/indicator-sound.conf.in 2015-12-23 14:13:32 +0000
+++ data/indicator-sound.conf.in 2016-10-11 14:09:21 +0000
@@ -6,4 +6,4 @@
6respawn6respawn
7respawn limit 30 107respawn limit 30 10
88
9exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service9exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service

Subscribers

People subscribed via source and target branches