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
Status: Merged
Approved by: dobey
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) Approve
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.
Revision history for this message
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/com.canonical.indicator.datetime.gschema.xml.in'
--- data/com.canonical.indicator.datetime.gschema.xml.in 2015-03-25 15:43:06 +0000
+++ data/com.canonical.indicator.datetime.gschema.xml.in 2015-10-07 15:43:39 +0000
@@ -132,7 +132,7 @@
132 </_description>132 </_description>
133 </key>133 </key>
134 <key name="alarm-default-sound" type="s">134 <key name="alarm-default-sound" type="s">
135 <default>'/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg'</default>135 <default>'/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg'</default>
136 <_summary>The alarm's default sound file.</_summary>136 <_summary>The alarm's default sound file.</_summary>
137 <_description>137 <_description>
138 If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.138 If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.
139139
=== modified file 'debian/changelog'
--- debian/changelog 2015-07-10 20:35:47 +0000
+++ debian/changelog 2015-10-07 15:43:39 +0000
@@ -1,3 +1,9 @@
1indicator-datetime (15.04.0) vivid; urgency=medium
2
3 * Manual version bump to resolve version number issue in landing
4
5 -- Charles Kerr <charles.kerr@canonical.com> Wed, 07 Oct 2015 10:20:52 -0500
6
1indicator-datetime (13.10.0+15.10.20150710.1-0ubuntu1) wily; urgency=medium7indicator-datetime (13.10.0+15.10.20150710.1-0ubuntu1) wily; urgency=medium
28
3 * New rebuild forced.9 * New rebuild forced.
410
=== modified file 'src/snap.cpp'
--- src/snap.cpp 2015-04-08 23:48:24 +0000
+++ src/snap.cpp 2015-10-07 15:43:39 +0000
@@ -192,7 +192,7 @@
192 std::string get_alarm_uri(const Alarm& alarm,192 std::string get_alarm_uri(const Alarm& alarm,
193 const std::shared_ptr<const Settings>& settings) const193 const std::shared_ptr<const Settings>& settings) const
194 {194 {
195 const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"};195 const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg"};
196196
197 const std::string candidates[] = { alarm.audio_url,197 const std::string candidates[] = { alarm.audio_url,
198 settings->alarm_sound.get(),198 settings->alarm_sound.get(),
199199
=== modified file 'tests/test-eds-ics-missing-trigger.cpp'
--- tests/test-eds-ics-missing-trigger.cpp 2015-06-18 04:52:52 +0000
+++ tests/test-eds-ics-missing-trigger.cpp 2015-10-07 15:43:39 +0000
@@ -77,7 +77,7 @@
77 a.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};77 a.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};
78 a.end = a.begin;78 a.end = a.begin;
79 a.alarms.resize(1);79 a.alarms.resize(1);
80 a.alarms[0].audio_url = "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg";80 a.alarms[0].audio_url = "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg";
81 a.alarms[0].time = a.begin;81 a.alarms[0].time = a.begin;
82 a.alarms[0].text = a.summary;82 a.alarms[0].text = a.summary;
83 expected.push_back(a);83 expected.push_back(a);
8484
=== modified file 'tests/test-eds-ics-missing-trigger.ics'
--- tests/test-eds-ics-missing-trigger.ics 2015-06-18 04:52:52 +0000
+++ tests/test-eds-ics-missing-trigger.ics 2015-10-07 15:43:39 +0000
@@ -14,7 +14,7 @@
14BEGIN:VALARM14BEGIN:VALARM
15X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-2@ubuntu-phablet15X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-2@ubuntu-phablet
16ACTION:AUDIO16ACTION:AUDIO
17ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg17ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
18END:VALARM18END:VALARM
19BEGIN:VALARM19BEGIN:VALARM
20X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-3@ubuntu-phablet20X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-3@ubuntu-phablet
@@ -34,7 +34,7 @@
34BEGIN:VALARM34BEGIN:VALARM
35X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-6@ubuntu-phablet35X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-6@ubuntu-phablet
36ACTION:AUDIO36ACTION:AUDIO
37ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg37ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
38END:VALARM38END:VALARM
39BEGIN:VALARM39BEGIN:VALARM
40X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-7@ubuntu-phablet40X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-7@ubuntu-phablet
4141
=== modified file 'tests/test-eds-ics-nonrepeating-events.cpp'
--- tests/test-eds-ics-nonrepeating-events.cpp 2015-05-20 23:23:32 +0000
+++ tests/test-eds-ics-nonrepeating-events.cpp 2015-10-07 15:43:39 +0000
@@ -73,7 +73,7 @@
73 expected_appt.color = "#becedd";73 expected_appt.color = "#becedd";
74 expected_appt.summary = "Alarm";74 expected_appt.summary = "Alarm";
75 std::array<Alarm,1> expected_alarms = {75 std::array<Alarm,1> expected_alarms = {
76 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,20,20,00,0)})76 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,20,20,00,0)})
77 };77 };
7878
79 // compare it to what we actually loaded...79 // compare it to what we actually loaded...
8080
=== modified file 'tests/test-eds-ics-nonrepeating-events.ics'
--- tests/test-eds-ics-nonrepeating-events.ics 2015-05-20 23:23:32 +0000
+++ tests/test-eds-ics-nonrepeating-events.ics 2015-10-07 15:43:39 +0000
@@ -14,7 +14,7 @@
14BEGIN:VALARM14BEGIN:VALARM
15X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet15X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet
16ACTION:AUDIO16ACTION:AUDIO
17ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg17ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
18TRIGGER;VALUE=DURATION;RELATED=START:PT0S18TRIGGER;VALUE=DURATION;RELATED=START:PT0S
19END:VALARM19END:VALARM
20BEGIN:VALARM20BEGIN:VALARM
2121
=== modified file 'tests/test-eds-ics-repeating-events.cpp'
--- tests/test-eds-ics-repeating-events.cpp 2015-05-20 23:23:32 +0000
+++ tests/test-eds-ics-repeating-events.cpp 2015-10-07 15:43:39 +0000
@@ -73,14 +73,14 @@
73 expected_appt.color = "#becedd";73 expected_appt.color = "#becedd";
74 expected_appt.summary = "Alarm";74 expected_appt.summary = "Alarm";
75 std::array<Alarm,8> expected_alarms = {75 std::array<Alarm,8> expected_alarms = {
76 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5, 8,16,40,0)}),76 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5, 8,16,40,0)}),
77 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,15,16,40,0)}),77 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,15,16,40,0)}),
78 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,22,16,40,0)}),78 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,22,16,40,0)}),
79 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,29,16,40,0)}),79 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,29,16,40,0)}),
80 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6, 5,16,40,0)}),80 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6, 5,16,40,0)}),
81 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,12,16,40,0)}),81 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,12,16,40,0)}),
82 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,19,16,40,0)}),82 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,19,16,40,0)}),
83 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,26,16,40,0)})83 Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,26,16,40,0)})
84 };84 };
8585
86 // compare it to what we actually loaded...86 // compare it to what we actually loaded...
8787
=== modified file 'tests/test-eds-ics-repeating-events.ics'
--- tests/test-eds-ics-repeating-events.ics 2015-05-20 23:23:32 +0000
+++ tests/test-eds-ics-repeating-events.ics 2015-10-07 15:43:39 +0000
@@ -15,7 +15,7 @@
15BEGIN:VALARM15BEGIN:VALARM
16X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet16X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet
17ACTION:AUDIO17ACTION:AUDIO
18ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg18ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
19TRIGGER;VALUE=DURATION;RELATED=START:PT0S19TRIGGER;VALUE=DURATION;RELATED=START:PT0S
20END:VALARM20END:VALARM
21BEGIN:VALARM21BEGIN:VALARM

Subscribers

People subscribed via source and target branches