Merge branch 'master' into to_push

1 files changed, 7 insertions, 2 deletions

diff --git a/src/AttentionNoticeHandler.cc b/src/AttentionNoticeHandler.cc
index 999b9d4..26dd4b5 100644
--- a/src/AttentionNoticeHandler.cc
+++ b/src/AttentionNoticeHandler.cc
@@ -119,6 +119,11 @@ void AttentionNoticeHandler::update(FbTk::Subject *subj) {
 
 }
 
-bool AttentionNoticeHandler::isDemandingAttention(Focusable &client) {
-    return m_attentions.find(&client) != m_attentions.end();
+bool AttentionNoticeHandler::isDemandingAttention(const Focusable &client) {
+    NoticeMap::iterator it = m_attentions.begin(), it_end = m_attentions.end();
+    for (; it != it_end; ++it) {
+        if (it->first == &client)
+            return true;
+    }
+    return false;
 }