diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-04-05 17:27:52 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2015-04-05 17:27:52 -0500 |
| commit | 62d68e6453c0ad69ff4d71099441a8151e9a9bea (patch) | |
| tree | 0ff1e3826ac919027bf3943a9ba1e7a4921c5f07 /src | |
| parent | e1aba742725c76257bd6845c93d3ac9a14d32089 (diff) | |
| download | ayatana-indicator-datetime-62d68e6453c0ad69ff4d71099441a8151e9a9bea.tar.gz ayatana-indicator-datetime-62d68e6453c0ad69ff4d71099441a8151e9a9bea.tar.bz2 ayatana-indicator-datetime-62d68e6453c0ad69ff4d71099441a8151e9a9bea.zip | |
fix misuse of ECalComponentAlarmInstance's fields.
Diffstat (limited to 'src')
| -rw-r--r-- | src/appointment.cpp | 3 | ||||
| -rw-r--r-- | src/engine-eds.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/appointment.cpp b/src/appointment.cpp index 236c5f4..1edd93c 100644 --- a/src/appointment.cpp +++ b/src/appointment.cpp @@ -31,8 +31,7 @@ bool Alarm::operator==(const Alarm& that) const { return (text==that.text) && (audio_url==that.audio_url) - && (this->time==that.time) - && (duration==that.duration); + && (this->time==that.time); } bool Appointment::operator==(const Appointment& that) const diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index ecbee59..856f190 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -559,7 +559,7 @@ private: if (a != nullptr) { - const DateTime alarm_begin{ai->occur_start}; + const DateTime alarm_begin{ai->trigger}; auto& alarm = alarms[alarm_begin]; if (alarm.text.empty()) @@ -568,8 +568,6 @@ private: alarm.audio_url = get_alarm_sound_url(a); if (!alarm.time.is_set()) alarm.time = alarm_begin; - if (alarm.duration == std::chrono::seconds::zero()) - alarm.duration = std::chrono::seconds(ai->occur_end - ai->occur_start); e_cal_component_alarm_free(a); } |