Change the default alarm sound from "Suru arpeggio.ogg" to "Alarm clock.ogg" Fixes: #1489037

Approved by: PS Jenkins bot, Pete Woods

8 files changed, 16 insertions, 16 deletions

diff --git a/data/com.canonical.indicator.datetime.gschema.xml.in b/data/com.canonical.indicator.datetime.gschema.xml.in
index 044f694..cd0a26d 100644
--- a/data/com.canonical.indicator.datetime.gschema.xml.in
+++ b/data/com.canonical.indicator.datetime.gschema.xml.in
@@ -132,7 +132,7 @@
 			</_description>
 		</key>
 		<key name="alarm-default-sound" type="s">
-			<default>'/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg'</default>
+			<default>'/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg'</default>
 			<_summary>The alarm's default sound file.</_summary>
 			<_description>
 			  If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.
diff --git a/src/snap.cpp b/src/snap.cpp
index 3867e90..9e470bc 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -192,7 +192,7 @@ private:
     std::string get_alarm_uri(const Alarm& alarm,
                               const std::shared_ptr<const Settings>& settings) const
     {
-        const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"};
+        const char* FALLBACK {"/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg"};
 
         const std::string candidates[] = { alarm.audio_url,
                                            settings->alarm_sound.get(),
diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp
index ba87011..4a26181 100644
--- a/tests/test-eds-ics-missing-trigger.cpp
+++ b/tests/test-eds-ics-missing-trigger.cpp
@@ -77,7 +77,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     a.begin = DateTime { gtz, 2015, 6, 18, 10, 0, 0};
     a.end = a.begin;
     a.alarms.resize(1);
-    a.alarms[0].audio_url = "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg";
+    a.alarms[0].audio_url = "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg";
     a.alarms[0].time = a.begin;
     a.alarms[0].text = a.summary;
     expected.push_back(a);
diff --git a/tests/test-eds-ics-missing-trigger.ics b/tests/test-eds-ics-missing-trigger.ics
index 048e7f2..915e0de 100644
--- a/tests/test-eds-ics-missing-trigger.ics
+++ b/tests/test-eds-ics-missing-trigger.ics
@@ -14,7 +14,7 @@ LAST-MODIFIED:20150617T211838Z
 BEGIN:VALARM

 X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-2@ubuntu-phablet

 ACTION:AUDIO

-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg

+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg

 END:VALARM

 BEGIN:VALARM

 X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-3@ubuntu-phablet

@@ -34,7 +34,7 @@ LAST-MODIFIED:20150617T211913Z
 BEGIN:VALARM

 X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-6@ubuntu-phablet

 ACTION:AUDIO

-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg

+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg

 END:VALARM

 BEGIN:VALARM

 X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-7@ubuntu-phablet

diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp
index a244f1e..819c422 100644
--- a/tests/test-eds-ics-nonrepeating-events.cpp
+++ b/tests/test-eds-ics-nonrepeating-events.cpp
@@ -73,7 +73,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     expected_appt.color = "#becedd";
     expected_appt.summary = "Alarm";
     std::array<Alarm,1> expected_alarms = {
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,20,20,00,0)})
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,20,20,00,0)})
     };
 
     // compare it to what we actually loaded...
diff --git a/tests/test-eds-ics-nonrepeating-events.ics b/tests/test-eds-ics-nonrepeating-events.ics
index f41fba3..65473f2 100644
--- a/tests/test-eds-ics-nonrepeating-events.ics
+++ b/tests/test-eds-ics-nonrepeating-events.ics
@@ -14,7 +14,7 @@ LAST-MODIFIED:20150520T223932Z
 BEGIN:VALARM

 X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet

 ACTION:AUDIO

-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg

+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg

 TRIGGER;VALUE=DURATION;RELATED=START:PT0S

 END:VALARM

 BEGIN:VALARM

diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp
index 526dcc6..92ef15c 100644
--- a/tests/test-eds-ics-repeating-events.cpp
+++ b/tests/test-eds-ics-repeating-events.cpp
@@ -73,14 +73,14 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     expected_appt.color = "#becedd";
     expected_appt.summary = "Alarm";
     std::array<Alarm,8> expected_alarms = {
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5, 8,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,15,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,22,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,29,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6, 5,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,12,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,19,16,40,0)}),
-        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,26,16,40,0)})
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5, 8,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,15,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,22,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,5,29,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6, 5,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,12,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,19,16,40,0)}),
+        Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg", DateTime(gtz,2015,6,26,16,40,0)})
     };
 
     // compare it to what we actually loaded...
diff --git a/tests/test-eds-ics-repeating-events.ics b/tests/test-eds-ics-repeating-events.ics
index efde5f7..1ab23bf 100644
--- a/tests/test-eds-ics-repeating-events.ics
+++ b/tests/test-eds-ics-repeating-events.ics
@@ -15,7 +15,7 @@ LAST-MODIFIED:20150507T211449Z
 BEGIN:VALARM

 X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet

 ACTION:AUDIO

-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg

+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg

 TRIGGER;VALUE=DURATION;RELATED=START:PT0S

 END:VALARM

 BEGIN:VALARM