aboutsummaryrefslogtreecommitdiff
path: root/src/appointment.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-12-08 23:08:41 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2014-12-08 23:08:41 +0000
commit13688fe9fffc1d9dad3bf5918efcc8221846c82b (patch)
treee6c54b125ac8689581d32678163c57514e8a0c96 /src/appointment.cpp
parent5186d1c20416dd4726de863b638a49b885ef7b9a (diff)
parent95bc85d108e3564d98f26b7ad17fcc72b2966371 (diff)
downloadayatana-indicator-datetime-13688fe9fffc1d9dad3bf5918efcc8221846c82b.tar.gz
ayatana-indicator-datetime-13688fe9fffc1d9dad3bf5918efcc8221846c82b.tar.bz2
ayatana-indicator-datetime-13688fe9fffc1d9dad3bf5918efcc8221846c82b.zip
Add support for x-canonical-alarm and x-canonical-disabled tags in VTODO categories so that disabled alarms will not be displayed. Fixes: #1387231
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'src/appointment.cpp')
-rw-r--r--src/appointment.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/appointment.cpp b/src/appointment.cpp
index f98e155..ae71459 100644
--- a/src/appointment.cpp
+++ b/src/appointment.cpp
@@ -29,12 +29,12 @@ namespace datetime {
bool Appointment::operator==(const Appointment& that) const
{
- return (color==that.color)
+ return (type==that.type)
+ && (uid==that.uid)
+ && (color==that.color)
&& (summary==that.summary)
&& (url==that.url)
&& (audio_url==that.audio_url)
- && (uid==that.uid)
- && (has_alarms==that.has_alarms)
&& (begin==that.begin)
&& (end==that.end);
}