From 03a7615f1ff6f4bb1d8bf955c042151336edac9b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 10 Jun 2014 11:56:32 -0500
Subject: 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.

---
 include/datetime/alarm-queue-simple.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/datetime')

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;
-- 
cgit v1.2.3