diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2016-03-31 16:26:27 -0300 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-07-05 01:59:46 +0200 |
| commit | 6df38ca1d68d1eb2fed2aca024ea938fb00d306c (patch) | |
| tree | 352ea4e5a26c3c43cf4ea4054dddd9ed41ac177f /src | |
| parent | b1031b1de834f246bba806cd51bfbb22f5c15b16 (diff) | |
| download | ayatana-indicator-datetime-6df38ca1d68d1eb2fed2aca024ea938fb00d306c.tar.gz ayatana-indicator-datetime-6df38ca1d68d1eb2fed2aca024ea938fb00d306c.tar.bz2 ayatana-indicator-datetime-6df38ca1d68d1eb2fed2aca024ea938fb00d306c.zip | |
Update tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine-eds.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 68e2bdd..7450beb 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -634,7 +634,6 @@ private: auto action = e_cal_component_alarm_get_action(alarm); if (action == E_CAL_COMPONENT_ALARM_AUDIO) { - ret = default_sound; ICalAttach *attach = nullptr; auto attachments = e_cal_component_alarm_get_attachments(alarm); @@ -650,6 +649,8 @@ private: ret = url; } } + if (ret.empty()) + ret = default_sound; } return ret; @@ -1141,8 +1142,9 @@ private: alarm.text = get_alarm_text(a); if (alarm.audio_url.empty()) - alarm.audio_url = get_alarm_sound_url(a, baseline.is_ubuntu_alarm() ? - ALARM_DEFAULT_SOUND : CALENDAR_DEFAULT_SOUND); + alarm.audio_url = get_alarm_sound_url(a, (baseline.is_ubuntu_alarm() ? + "file://" ALARM_DEFAULT_SOUND : + "file://" ALARM_DEFAULT_SOUND)); if (!alarm.time.is_set()) alarm.time = trigger_time; @@ -1158,7 +1160,7 @@ private: appointment.alarms.reserve(i.second.size()); for (auto& j : i.second) { - if (j.second.has_text() || (j.second.has_sound())) + if (j.second.has_text() || j.second.has_sound()) appointment.alarms.push_back(j.second); } subtask->task->appointments.push_back(appointment); |