1 files changed, 11 insertions, 7 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e9c548c..3a07060 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -455,7 +455,9 @@ void Fluxbox::initScreen(BScreen *screen) {
     // attach screen signals to this
     screen->focusedWindowSig().attach(this);
     screen->workspaceAreaSig().attach(this);
-    screen->clientListSig().attach(this);
+
+    join(screen->clientListSig(),
+         FbTk::MemFun(*this, &Fluxbox::clientListChanged));
 
     join(screen->workspaceNamesSig(), 
          FbTk::MemFun(*this, &Fluxbox::workspaceNamesChanged));
@@ -1117,12 +1119,6 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
                 if ((*it).first->update())
                     (*it).first->updateWorkarea(screen);
             }
-        } else if ((&(screen.clientListSig())) == changedsub) {
-            for (AtomHandlerContainerIt it= m_atomhandler.begin();
-                 it != m_atomhandler.end(); ++it) {
-                if ((*it).first->update())
-                    (*it).first->updateClientList(screen);
-            }
         }
     }
 }
@@ -1533,3 +1529,11 @@ void Fluxbox::workspaceNamesChanged(BScreen &screen) {
             (*it).first->updateWorkspaceNames(screen);
     }
 }
+
+void Fluxbox::clientListChanged(BScreen &screen) {
+    for (AtomHandlerContainerIt it= m_atomhandler.begin();
+         it != m_atomhandler.end(); ++it) {
+        if ((*it).first->update())
+            (*it).first->updateClientList(screen);
+    }
+}