1 files changed, 10 insertions, 5 deletions

diff --git a/src/Workspace.cc b/src/Workspace.cc
index b266d78..ff3b21f 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -1,5 +1,5 @@
 // Workspace.cc for Fluxbox
-// Copyright (c) 2001 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
+// Copyright (c) 2001 - 2008 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Workspace.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
@@ -34,6 +34,7 @@
 #include "FbTk/I18n.hh"
 #include "FbTk/StringUtil.hh"
 #include "FbTk/FbString.hh"
+#include "FbTk/MemFun.hh"
 
 // use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -70,13 +71,17 @@ using std::endl;
 
 Workspace::Workspace(BScreen &scrn, const string &name, unsigned int id):
     m_screen(scrn),
-    m_clientmenu(scrn, m_windowlist, &m_clientlist_sig),
+    m_clientmenu(scrn, m_windowlist, false),
     m_name(name),
     m_id(id) {
 
+    m_clientlist_sig.connect(FbTk::MemFun(m_clientmenu,
+                                          &ClientMenu::refreshMenu));
+
     menu().setInternalMenu();
     setName(name);
 
+
 }
 
 
@@ -91,7 +96,7 @@ void Workspace::addWindow(FluxboxWindow &w) {
     w.setWorkspace(m_id);
 
     m_windowlist.push_back(&w);
-    m_clientlist_sig.notify();
+    m_clientlist_sig.emit();
 
 }
 
@@ -108,7 +113,7 @@ int Workspace::removeWindow(FluxboxWindow *w, bool still_alive) {
         FocusControl::unfocusWindow(w->winClient(), true, true);
 
     m_windowlist.remove(w);
-    m_clientlist_sig.notify();
+    m_clientlist_sig.emit();
 
     return m_windowlist.size();
 }
@@ -190,5 +195,5 @@ void Workspace::shutdown() {
 }
 
 void Workspace::updateClientmenu() {
-    m_clientlist_sig.notify();
+    m_clientlist_sig.emit();
 }