aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2015-04-05 17:27:52 -0500
committerCharles Kerr <charles.kerr@canonical.com>2015-04-05 17:27:52 -0500
commit62d68e6453c0ad69ff4d71099441a8151e9a9bea (patch)
tree0ff1e3826ac919027bf3943a9ba1e7a4921c5f07
parente1aba742725c76257bd6845c93d3ac9a14d32089 (diff)
downloadayatana-indicator-datetime-62d68e6453c0ad69ff4d71099441a8151e9a9bea.tar.gz
ayatana-indicator-datetime-62d68e6453c0ad69ff4d71099441a8151e9a9bea.tar.bz2
ayatana-indicator-datetime-62d68e6453c0ad69ff4d71099441a8151e9a9bea.zip
fix misuse of ECalComponentAlarmInstance's fields.
-rw-r--r--include/datetime/appointment.h1
-rw-r--r--src/appointment.cpp3
-rw-r--r--src/engine-eds.cpp4
-rw-r--r--tests/manual-test-snap.cpp2
-rw-r--r--tests/test-alarm-queue.cpp4
-rw-r--r--tests/test-snap.cpp2
6 files changed, 6 insertions, 10 deletions
diff --git a/include/datetime/appointment.h b/include/datetime/appointment.h
index 337d9b8..e9c1bc2 100644
--- a/include/datetime/appointment.h
+++ b/include/datetime/appointment.h
@@ -39,7 +39,6 @@ struct Alarm
std::string text;
std::string audio_url;
DateTime time;
- std::chrono::seconds duration;
bool operator== (const Alarm& that) const;
};
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);
}
diff --git a/tests/manual-test-snap.cpp b/tests/manual-test-snap.cpp
index cbe79cd..d04cf14 100644
--- a/tests/manual-test-snap.cpp
+++ b/tests/manual-test-snap.cpp
@@ -71,7 +71,7 @@ int main(int argc, const char* argv[])
a.type = Appointment::UBUNTU_ALARM;
a.begin = DateTime::Local(2014, 12, 25, 0, 0, 0);
a.end = a.begin.end_of_day();
- a.alarms.push_back(Alarm{"Alarm Text", "", a.begin, std::chrono::seconds::zero()});
+ a.alarms.push_back(Alarm{"Alarm Text", "", a.begin});
auto loop = g_main_loop_new(nullptr, false);
auto on_snooze = [loop](const Appointment& appt, const Alarm&){
diff --git a/tests/test-alarm-queue.cpp b/tests/test-alarm-queue.cpp
index fdab425..aa35668 100644
--- a/tests/test-alarm-queue.cpp
+++ b/tests/test-alarm-queue.cpp
@@ -79,7 +79,7 @@ protected:
a1.type = Appointment::UBUNTU_ALARM;
a1.begin = tomorrow_begin;
a1.end = tomorrow_end;
- a1.alarms.push_back(Alarm{"Alarm Text", "", a1.begin, std::chrono::seconds::zero()});
+ a1.alarms.push_back(Alarm{"Alarm Text", "", a1.begin});
const auto ubermorgen_begin = now.add_days(2).start_of_day();
const auto ubermorgen_end = ubermorgen_begin.end_of_day();
@@ -92,7 +92,7 @@ protected:
a2.type = Appointment::EVENT;
a2.begin = ubermorgen_begin;
a2.end = ubermorgen_end;
- a2.alarms.push_back(Alarm{"Alarm Text", "", a2.begin, std::chrono::seconds::zero()});
+ a2.alarms.push_back(Alarm{"Alarm Text", "", a2.begin});
return std::vector<Appointment>({a1, a2});
}
diff --git a/tests/test-snap.cpp b/tests/test-snap.cpp
index 2e29132..46fbd10 100644
--- a/tests/test-snap.cpp
+++ b/tests/test-snap.cpp
@@ -111,7 +111,7 @@ protected:
const auto christmas = DateTime::Local(2015,12,25,0,0,0);
appt.begin = christmas.start_of_day();
appt.end = christmas.end_of_day();
- appt.alarms.push_back(Alarm{"Alarm Text", "", appt.begin, std::chrono::seconds::zero()});
+ appt.alarms.push_back(Alarm{"Alarm Text", "", appt.begin});
service = dbus_test_service_new(nullptr);