GSettings Ubuntu touch schemas

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

  1. add-sound-as-schema
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 22
Merged at revision: 17
Proposed branch: lp:~laney/gsettings-ubuntu-touch-schemas/add-sound-as-schema
Merge into: lp:gsettings-ubuntu-touch-schemas
Prerequisite: lp:~laney/gsettings-ubuntu-touch-schemas/add-accountsservice-schema
Diff against target: 37 lines (+23/-1)
2 files modified
accountsservice/Makefile.am (+2/-1)
accountsservice/com.ubuntu.touch.AccountsService.Sound.xml (+21/-0)
To merge this branch: bzr merge lp:~laney/gsettings-ubuntu-touch-schemas/add-sound-as-schema
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+201475@code.launchpad.net

This proposal supersedes a proposal from 2014-01-13.

Commit message

Add the Sound schema (LP: #1265528)

Description of the change

Add the Sound schema (LP: #1265528)

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

resubmitted as I forgot the prereq

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'accountsservice/Makefile.am'
2--- accountsservice/Makefile.am 2014-01-13 17:59:01 +0000
3+++ accountsservice/Makefile.am 2014-01-13 17:59:01 +0000
4@@ -1,5 +1,6 @@
5 accountsservice_schemas = \
6- com.ubuntu.touch.AccountsService.SecurityPrivacy.xml
7+ com.ubuntu.touch.AccountsService.SecurityPrivacy.xml \
8+ com.ubuntu.touch.AccountsService.Sound.xml
9
10 EXTRA_DIST = \
11 $(accountsservice_schemas)
12
13=== added file 'accountsservice/com.ubuntu.touch.AccountsService.Sound.xml'
14--- accountsservice/com.ubuntu.touch.AccountsService.Sound.xml 1970-01-01 00:00:00 +0000
15+++ accountsservice/com.ubuntu.touch.AccountsService.Sound.xml 2014-01-13 17:59:01 +0000
16@@ -0,0 +1,21 @@
17+<node>
18+ <interface name="com.ubuntu.touch.AccountsService.Sound">
19+
20+ <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
21+
22+ <property name="SilentMode" type="b" access="readwrite">
23+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
24+ </property>
25+
26+ <property name="IncomingCallSound" type="s" access="readwrite">
27+ <annotation name="org.freedesktop.Accounts.DefaultValue.String"
28+ value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
29+ </property>
30+
31+ <property name="IncomingMessageSound" type="s" access="readwrite">
32+ <annotation name="org.freedesktop.Accounts.DefaultValue.String"
33+ value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
34+ </property>
35+
36+ </interface>
37+</node>

Subscribers

People subscribed via source and target branches