Indicator Date and Time

Merge lp:~charlesk/indicator-datetime/lp-1489037-change-default-alarm-sound-15.04 into lp:indicator-datetime/15.04

  1. lp-1489037-change-default-alarm-sound-15.04
  2. Merge into trunk.15.04
Proposed by Charles Kerr on 2015-10-07
Status: Merged
Approved by: dobey on 2015-10-07
Approved revision: 422
Merged at revision: 420
Proposed branch: lp:~charlesk/indicator-datetime/lp-1489037-change-default-alarm-sound-15.04
Merge into: lp:indicator-datetime/15.04
Diff against target: 140 lines (+22/-16)
9 files modified
data/com.canonical.indicator.datetime.gschema.xml.in (+1/-1)
debian/changelog (+6/-0)
src/snap.cpp (+1/-1)
tests/test-eds-ics-missing-trigger.cpp (+1/-1)
tests/test-eds-ics-missing-trigger.ics (+2/-2)
tests/test-eds-ics-nonrepeating-events.cpp (+1/-1)
tests/test-eds-ics-nonrepeating-events.ics (+1/-1)
tests/test-eds-ics-repeating-events.cpp (+8/-8)
tests/test-eds-ics-repeating-events.ics (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/lp-1489037-change-default-alarm-sound-15.04
Reviewer Review Type Date Requested Status
Pete Woods (community) 2015-10-07 Approve on 2015-10-07
Review via email: mp+273697@code.launchpad.net

Commit message

Change the default alarm sound from 'suru arpeggio' to 'alarm clock'.

Description of the change

Change the default alarm sound from 'suru arpeggio' to 'alarm clock'.

This is fixed in 15.10 but that patch doesn't apply cleanly to 15.04, so here it is again in 15.04 form.

To post a comment you must log in.
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/com.canonical.indicator.datetime.gschema.xml.in'
2--- data/com.canonical.indicator.datetime.gschema.xml.in 2015-03-25 15:43:06 +0000
3+++ data/com.canonical.indicator.datetime.gschema.xml.in 2015-10-07 15:43:39 +0000
4@@ -132,7 +132,7 @@
5 </_description>
6 </key>
7 <key name="alarm-default-sound" type="s">
8- <default>'/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg'</default>
9+ <default>'/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg'</default>
10 <_summary>The alarm's default sound file.</_summary>
11 <_description>
12 If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-07-10 20:35:47 +0000
16+++ debian/changelog 2015-10-07 15:43:39 +0000
17@@ -1,3 +1,9 @@
18+indicator-datetime (15.04.0) vivid; urgency=medium
19+
20+ * Manual version bump to resolve version number issue in landing
21+
22+ -- Charles Kerr <charles.kerr@canonical.com> Wed, 07 Oct 2015 10:20:52 -0500
23+
24 indicator-datetime (13.10.0+15.10.20150710.1-0ubuntu1) wily; urgency=medium
25
26 * New rebuild forced.
27
28=== modified file 'src/snap.cpp'
29--- src/snap.cpp 2015-04-08 23:48:24 +0000
30+++ src/snap.cpp 2015-10-07 15:43:39 +0000
31@@ -192,7 +192,7 @@
32 std::string get_alarm_uri(const Alarm& alarm,
33 const std::shared_ptr<const Settings>& settings) const
34 {
35- const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"};
36+ const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg"};
37
38 const std::string candidates[] = { alarm.audio_url,
39 settings->alarm_sound.get(),
40
41=== modified file 'tests/test-eds-ics-missing-trigger.cpp'
42--- tests/test-eds-ics-missing-trigger.cpp 2015-06-18 04:52:52 +0000
43+++ tests/test-eds-ics-missing-trigger.cpp 2015-10-07 15:43:39 +0000
44@@ -77,7 +77,7 @@
45 a.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};
46 a.end = a.begin;
47 a.alarms.resize(1);
48- a.alarms[0].audio_url = "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg";
49+ a.alarms[0].audio_url = "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg";
50 a.alarms[0].time = a.begin;
51 a.alarms[0].text = a.summary;
52 expected.push_back(a);
53
54=== modified file 'tests/test-eds-ics-missing-trigger.ics'
55--- tests/test-eds-ics-missing-trigger.ics 2015-06-18 04:52:52 +0000
56+++ tests/test-eds-ics-missing-trigger.ics 2015-10-07 15:43:39 +0000
57@@ -14,7 +14,7 @@
58 BEGIN:VALARM
59 X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-2@ubuntu-phablet
60 ACTION:AUDIO
61-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg
62+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
63 END:VALARM
64 BEGIN:VALARM
65 X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-3@ubuntu-phablet
66@@ -34,7 +34,7 @@
67 BEGIN:VALARM
68 X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-6@ubuntu-phablet
69 ACTION:AUDIO
70-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg
71+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
72 END:VALARM
73 BEGIN:VALARM
74 X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-7@ubuntu-phablet
75
76=== modified file 'tests/test-eds-ics-nonrepeating-events.cpp'
77--- tests/test-eds-ics-nonrepeating-events.cpp 2015-05-20 23:23:32 +0000
78+++ tests/test-eds-ics-nonrepeating-events.cpp 2015-10-07 15:43:39 +0000
79@@ -73,7 +73,7 @@
80 expected_appt.color = "#becedd";
81 expected_appt.summary = "Alarm";
82 std::array<Alarm,1> expected_alarms = {
83- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,20,20,00,0)})
84+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,20,20,00,0)})
85 };
86
87 // compare it to what we actually loaded...
88
89=== modified file 'tests/test-eds-ics-nonrepeating-events.ics'
90--- tests/test-eds-ics-nonrepeating-events.ics 2015-05-20 23:23:32 +0000
91+++ tests/test-eds-ics-nonrepeating-events.ics 2015-10-07 15:43:39 +0000
92@@ -14,7 +14,7 @@
93 BEGIN:VALARM
94 X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet
95 ACTION:AUDIO
96-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg
97+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
98 TRIGGER;VALUE=DURATION;RELATED=START:PT0S
99 END:VALARM
100 BEGIN:VALARM
101
102=== modified file 'tests/test-eds-ics-repeating-events.cpp'
103--- tests/test-eds-ics-repeating-events.cpp 2015-05-20 23:23:32 +0000
104+++ tests/test-eds-ics-repeating-events.cpp 2015-10-07 15:43:39 +0000
105@@ -73,14 +73,14 @@
106 expected_appt.color = "#becedd";
107 expected_appt.summary = "Alarm";
108 std::array<Alarm,8> expected_alarms = {
109- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5, 8,16,40,0)}),
110- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,15,16,40,0)}),
111- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,22,16,40,0)}),
112- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,29,16,40,0)}),
113- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6, 5,16,40,0)}),
114- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,12,16,40,0)}),
115- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,19,16,40,0)}),
116- Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,26,16,40,0)})
117+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5, 8,16,40,0)}),
118+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,15,16,40,0)}),
119+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,22,16,40,0)}),
120+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,29,16,40,0)}),
121+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6, 5,16,40,0)}),
122+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,12,16,40,0)}),
123+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,19,16,40,0)}),
124+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,26,16,40,0)})
125 };
126
127 // compare it to what we actually loaded...
128
129=== modified file 'tests/test-eds-ics-repeating-events.ics'
130--- tests/test-eds-ics-repeating-events.ics 2015-05-20 23:23:32 +0000
131+++ tests/test-eds-ics-repeating-events.ics 2015-10-07 15:43:39 +0000
132@@ -15,7 +15,7 @@
133 BEGIN:VALARM
134 X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet
135 ACTION:AUDIO
136-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg
137+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
138 TRIGGER;VALUE=DURATION;RELATED=START:PT0S
139 END:VALARM
140 BEGIN:VALARM

Subscribers

People subscribed via source and target branches