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

[Sergio Schvezov]

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

[Roberto Alsina (ralsina)]

review: Approve

[lp:~sergiusens/account-polld/sound_from_xdg_data]

28. By Sergio Schvezov on 2014-07-28

Fix typo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/account-polld-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/25/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/plugins.go'
--- plugins/plugins.go	2014-07-28 16:02:34 +0000
+++ plugins/plugins.go	2014-07-28 16:02:35 +0000
@@ -145,7 +145,8 @@
 
 // DefaultSound returns the path to the default sound for a Notification
 func DefaultSound() string {
-	return "/usr/share/sounds/ubuntu/notifications/Slick.ogg"
+	// path is searched within XDG_DATA_DIRS
+	return "sounds/ubuntu/notifications/Slick.ogg"
 }
 
 // DefaultVibration returns a Vibrate with the default vibration