Changed workspace area signal to use the new signal system

1 files changed, 11 insertions, 11 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4041444..b83fa9c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -453,7 +453,9 @@ void Fluxbox::initScreen(BScreen *screen) {
     screen->initWindows();
 
     // attach screen signals to this
-    screen->workspaceAreaSig().attach(this);
+
+    join(screen->workspaceAreaSig(),
+         FbTk::MemFun(*this, &Fluxbox::workspaceAreaChanged));
 
     join(screen->focusedWindowSig(),
          FbTk::MemFun(*this, &Fluxbox::focusedWindowChanged));
@@ -1104,16 +1106,6 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
         }
 
         screen.removeClient(*client);
-    } else if (typeid(*changedsub) == typeid(BScreen::ScreenSubject)) {
-        BScreen::ScreenSubject *subj = dynamic_cast<BScreen::ScreenSubject *>(changedsub);
-        BScreen &screen = subj->screen();
-        if ((&(screen.workspaceAreaSig())) == changedsub) {
-            for (AtomHandlerContainerIt it= m_atomhandler.begin();
-                 it != m_atomhandler.end(); ++it) {
-                if ((*it).first->update())
-                    (*it).first->updateWorkarea(screen);
-            }
-        }
     }
 }
 
@@ -1540,3 +1532,11 @@ void Fluxbox::focusedWindowChanged(BScreen &screen,
         (*it).first->updateFocusedWindow(screen, client ? client->window() : 0 );
     }
 }
+
+void Fluxbox::workspaceAreaChanged(BScreen &screen) {
+    for (AtomHandlerContainerIt it= m_atomhandler.begin();
+         it != m_atomhandler.end(); ++it) {
+        if ((*it).first->update())
+            (*it).first->updateWorkarea(screen);
+    }
+}