Merge lp:~sergiusens/account-polld/sound_from_xdg_data into lp:~phablet-team/account-polld/trunk

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 28
Merged at revision: 26
Proposed branch: lp:~sergiusens/account-polld/sound_from_xdg_data
Merge into: lp:~phablet-team/account-polld/trunk
Prerequisite: lp:~sergiusens/account-polld/reset_poll
Diff against target: 13 lines (+2/-1)
1 file modified
plugins/plugins.go (+2/-1)
To merge this branch: bzr merge lp:~sergiusens/account-polld/sound_from_xdg_data
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Roberto Alsina (community) Approve
Review via email:

Commit message

Set the default sound to a path relative to an XDG_DATA_DIR as the push client searches within those paths.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
28. By Sergio Schvezov

Fix typo

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/plugins.go'
2--- plugins/plugins.go 2014-07-28 16:02:34 +0000
3+++ plugins/plugins.go 2014-07-28 16:02:35 +0000
4@@ -145,7 +145,8 @@
6 // DefaultSound returns the path to the default sound for a Notification
7 func DefaultSound() string {
8- return "/usr/share/sounds/ubuntu/notifications/Slick.ogg"
9+ // path is searched within XDG_DATA_DIRS
10+ return "sounds/ubuntu/notifications/Slick.ogg"
11 }
13 // DefaultVibration returns a Vibrate with the default vibration


People subscribed via source and target branches