Changed workspace names signal in BScreen to use the new signal system

1 files changed, 11 insertions, 8 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index acbb55d..e9c548c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -454,10 +454,11 @@ void Fluxbox::initScreen(BScreen *screen) {
 
     // attach screen signals to this
     screen->focusedWindowSig().attach(this);
-    screen->workspaceNamesSig().attach(this);
     screen->workspaceAreaSig().attach(this);
     screen->clientListSig().attach(this);
 
+    join(screen->workspaceNamesSig(), 
+         FbTk::MemFun(*this, &Fluxbox::workspaceNamesChanged));
     join(screen->currentWorkspaceSig(), 
          FbTk::MemFun(*this, &Fluxbox::workspaceChanged));
 
@@ -1102,13 +1103,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
     } else if (typeid(*changedsub) == typeid(BScreen::ScreenSubject)) {
         BScreen::ScreenSubject *subj = dynamic_cast<BScreen::ScreenSubject *>(changedsub);
         BScreen &screen = subj->screen();
-        if ((&(screen.workspaceNamesSig())) == changedsub) {
-            for (AtomHandlerContainerIt it= m_atomhandler.begin();
-                 it != m_atomhandler.end(); ++it) {
-                if ((*it).first->update())
-                    (*it).first->updateWorkspaceNames(screen);
-            }
-        } else if ((&(screen.focusedWindowSig())) == changedsub) {
+        if ((&(screen.focusedWindowSig())) == changedsub) {
             for (AtomHandlerContainerIt it= m_atomhandler.begin();
                  it != m_atomhandler.end(); it++) {
                 (*it).first->updateFocusedWindow(screen,
@@ -1530,3 +1525,11 @@ void Fluxbox::workspaceChanged( BScreen& screen ) {
             (*it).first->updateCurrentWorkspace(screen);
     }
 }
+
+void Fluxbox::workspaceNamesChanged(BScreen &screen) {
+    for (AtomHandlerContainerIt it= m_atomhandler.begin();
+         it != m_atomhandler.end(); ++it) {
+        if ((*it).first->update())
+            (*it).first->updateWorkspaceNames(screen);
+    }
+}