aboutsummaryrefslogtreecommitdiff
path: root/src/appointment.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2015-04-06 23:35:42 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-04-06 23:35:42 +0000
commit227aa820086c19279743d502fd5e78cf17144b24 (patch)
tree9465713567b8af9f8f9762450bb43ae5a39a7fb8 /src/appointment.cpp
parent9f48c6479a17771597544adc36eac968b9b5c027 (diff)
parent10c574cc26a4a55d63eed7f3b846efb4d766dd6b (diff)
downloadayatana-indicator-datetime-227aa820086c19279743d502fd5e78cf17144b24.tar.gz
ayatana-indicator-datetime-227aa820086c19279743d502fd5e78cf17144b24.tar.bz2
ayatana-indicator-datetime-227aa820086c19279743d502fd5e78cf17144b24.zip
Improve valarm support to honor calendar events' valarm triggers. Fixes: #1419001
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'src/appointment.cpp')
-rw-r--r--src/appointment.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/appointment.cpp b/src/appointment.cpp
index ae71459..1edd93c 100644
--- a/src/appointment.cpp
+++ b/src/appointment.cpp
@@ -27,16 +27,22 @@ namespace datetime {
*****
****/
+bool Alarm::operator==(const Alarm& that) const
+{
+ return (text==that.text)
+ && (audio_url==that.audio_url)
+ && (this->time==that.time);
+}
+
bool Appointment::operator==(const Appointment& that) const
{
return (type==that.type)
&& (uid==that.uid)
&& (color==that.color)
&& (summary==that.summary)
- && (url==that.url)
- && (audio_url==that.audio_url)
&& (begin==that.begin)
- && (end==that.end);
+ && (end==that.end)
+ && (alarms==that.alarms);
}
/****