Store menus if smart pointers (RefCount)

This was originally intended to be a bugfix for an memory error reported by valgrind (accessing
freed memory). While debugging it, I found the menu ownership semantics confusing
(setInternalMenu() et al.), so I decided to get rid of it and store it in smart pointers
everywhere.
Looking back, I'm not sure if this was worth all the trouble, but the good news is that the
valgrind error disappeared. :)

1 files changed, 5 insertions, 7 deletions

diff --git a/src/Workspace.cc b/src/Workspace.cc
index a162b4c..8b3c411 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -65,17 +65,15 @@ using std::string;
 
 Workspace::Workspace(BScreen &scrn, const string &name, unsigned int id):
     m_screen(scrn),
-    m_clientmenu(scrn, m_windowlist, false),
+    m_clientmenu(new ClientMenu(scrn, m_windowlist, false) ),
     m_name(name),
     m_id(id) {
 
-    m_clientlist_sig.connect(FbTk::MemFun(m_clientmenu,
+    m_clientlist_sig.connect(FbTk::MemFun(*m_clientmenu,
                                           &ClientMenu::refreshMenu));
 
-    menu().setInternalMenu();
     setName(name);
 
-
 }
 
 
@@ -145,7 +143,7 @@ void Workspace::removeAll(unsigned int dest) {
 
 
 void Workspace::reconfigure() {
-    menu().reconfigure();
+    menu()->reconfigure();
 
     Windows::iterator it = m_windowlist.begin();
     Windows::iterator it_end = m_windowlist.end();
@@ -176,8 +174,8 @@ void Workspace::setName(const string &name) {
 
     screen().updateWorkspaceName(m_id);
 
-    menu().setLabel(FbTk::BiDiString(m_name));
-    menu().updateMenu();
+    menu()->setLabel(FbTk::BiDiString(m_name));
+    menu()->updateMenu();
 }
 
 /**