aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-06-10 11:56:32 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-06-10 11:56:32 -0500
commit03a7615f1ff6f4bb1d8bf955c042151336edac9b (patch)
tree8fbca3fe56f01ffb72d30fa806a8eb28bae70b16 /include
parente32110f08d6888e25db5bcedb7fd274aa8caea51 (diff)
downloadayatana-indicator-datetime-03a7615f1ff6f4bb1d8bf955c042151336edac9b.tar.gz
ayatana-indicator-datetime-03a7615f1ff6f4bb1d8bf955c042151336edac9b.tar.bz2
ayatana-indicator-datetime-03a7615f1ff6f4bb1d8bf955c042151336edac9b.zip
in SimpleAlarmQueue, the 'alarms we don't want to trigger' list needs to be composed of uid + timestamp. Keying off of only timestamp doesn't work because UIDs can be recycled as users edit and reuse alarms.
Diffstat (limited to 'include')
-rw-r--r--include/datetime/alarm-queue-simple.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/datetime/alarm-queue-simple.h b/include/datetime/alarm-queue-simple.h
index af1145a..d191aec 100644
--- a/include/datetime/alarm-queue-simple.h
+++ b/include/datetime/alarm-queue-simple.h
@@ -47,7 +47,7 @@ private:
std::vector<Appointment> find_current_alarms() const;
void check_alarms();
- std::set<std::string> m_triggered;
+ std::set<std::pair<std::string,DateTime>> m_triggered;
const std::shared_ptr<Clock> m_clock;
const std::shared_ptr<Planner> m_planner;
const std::shared_ptr<WakeupTimer> m_timer;