1 files changed, 2 insertions, 13 deletions

diff --git a/src/AttentionNoticeHandler.cc b/src/AttentionNoticeHandler.cc
index 88dd72a..9052319 100644
--- a/src/AttentionNoticeHandler.cc
+++ b/src/AttentionNoticeHandler.cc
@@ -88,9 +88,8 @@ void AttentionNoticeHandler::addAttention(Focusable &client) {
 
     m_attentions[&client] = timer; 
     // attach signals that will make notice go away
-    client.dieSig().attach(this);
-
-    client.focusSig().connect(MemFun(*this, &AttentionNoticeHandler::windowFocusChanged));
+    join(client.dieSig(), MemFun(*this, &AttentionNoticeHandler::removeWindow));
+    join(client.focusSig(), MemFun(*this, &AttentionNoticeHandler::windowFocusChanged));
 
     // update _NET_WM_STATE atom
     if (client.fbwindow())
@@ -104,16 +103,6 @@ void AttentionNoticeHandler::removeWindow(Focusable& win) {
     updateWindow(win, true);
 }
 
-void AttentionNoticeHandler::update(FbTk::Subject* subj) {
-    // we need to be able to get the window
-    if (!subj || typeid(*subj) != typeid(Focusable::FocusSubject))
-        return;
-    Focusable::FocusSubject *winsubj =
-        static_cast<Focusable::FocusSubject *>(subj);
-
-    removeWindow(winsubj->win());
-}
-
 void AttentionNoticeHandler::updateWindow(Focusable& win, bool died) {
     // all signals results in destruction of the notice