Merge lp:~laney/gsettings-ubuntu-touch-schemas/add-sound-as-schema into lp:gsettings-ubuntu-touch-schemas

[Iain Lane]

Add the Sound schema (LP: #1265528)

Add the Sound schema (LP: #1265528)

[Iain Lane (laney)]

resubmitted as I forgot the prereq

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:22
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/gsettings-ubuntu-touch-schemas/add-sound-as-schema/+merge/201475/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'accountsservice/Makefile.am'
--- accountsservice/Makefile.am	2014-01-13 17:59:01 +0000
+++ accountsservice/Makefile.am	2014-01-13 17:59:01 +0000
@@ -1,5 +1,6 @@
 accountsservice_schemas = \
-	com.ubuntu.touch.AccountsService.SecurityPrivacy.xml
+	com.ubuntu.touch.AccountsService.SecurityPrivacy.xml \
+	com.ubuntu.touch.AccountsService.Sound.xml
 
 EXTRA_DIST =				\
 	$(accountsservice_schemas)	
 
=== added file 'accountsservice/com.ubuntu.touch.AccountsService.Sound.xml'
--- accountsservice/com.ubuntu.touch.AccountsService.Sound.xml	1970-01-01 00:00:00 +0000
+++ accountsservice/com.ubuntu.touch.AccountsService.Sound.xml	2014-01-13 17:59:01 +0000
@@ -0,0 +1,21 @@
+<node>
+    <interface name="com.ubuntu.touch.AccountsService.Sound">
+
+        <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
+
+        <property name="SilentMode" type="b" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
+        </property>
+
+        <property name="IncomingCallSound" type="s" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue.String" 
+                value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
+        </property>
+
+        <property name="IncomingMessageSound" type="s" access="readwrite">
+            <annotation name="org.freedesktop.Accounts.DefaultValue.String" 
+                value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
+        </property>
+
+    </interface>
+</node>