Attach modifiedSig handlers to the session.screenX.windowMenu resource

2 files changed, 4 insertions, 12 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 931b356..8f1fcef 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -849,9 +849,6 @@ void BScreen::reconfigure() {
     for(size_t i = 0; i < std::min(m_workspaces_list.size(), resource.workspace_names->size()); ++i)
         m_workspaces_list[i]->setName( resource.workspace_names.get()[i] );
 
-    // update menu filenames
-    m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename());
-
     // reconfigure workspaces
     for_each(m_workspaces_list.begin(),
              m_workspaces_list.end(),
@@ -1366,7 +1363,9 @@ void BScreen::initMenus() {
             MemFun(*m_rootmenu->reloadHelper(), &FbTk::AutoReloadHelper::setMainFile));
     m_rootmenu->reloadHelper()->setMainFile(*Fluxbox::instance()->getMenuResource());
 
-    m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename());
+    m_tracker.join(resource.windowmenufile.modifiedSig(),
+            MemFun(*m_windowmenu->reloadHelper(), &FbTk::AutoReloadHelper::setMainFile));
+    m_windowmenu->reloadHelper()->setMainFile(*resource.windowmenufile);
 }
 
 
@@ -1410,12 +1409,6 @@ void BScreen::rereadMenu() {
 
 }
 
-const std::string BScreen::windowMenuFilename() const {
-    if ((*resource.windowmenufile).empty())
-        return Fluxbox::instance()->getDefaultDataFilename("windowmenu");
-    return *resource.windowmenufile;
-}
-
 void BScreen::rereadWindowMenu() {
     lua::state &l = Fluxbox::instance()->lua();
     l.checkstack(1);
@@ -1423,7 +1416,7 @@ void BScreen::rereadWindowMenu() {
 
     m_windowmenu->removeAll();
     try {
-        l.loadfile(FbTk::StringUtil::expandFilename(windowMenuFilename()).c_str());
+        l.loadfile(FbTk::StringUtil::expandFilename(resource.windowmenufile).c_str());
         l.call(0, 1);
         MenuCreator::createMenu(*m_windowmenu, l, m_windowmenu->reloadHelper());
     }
diff --git a/src/Screen.hh b/src/Screen.hh
index 2ff87db..3b54815 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -109,7 +109,6 @@ public:
     bool getMaxDisableResize() const { return *resource.max_disable_resize; }
     bool doShowWindowPos() const { return *resource.show_window_pos; }
     FbTk::StringResource &defaultDecoResource() { return resource.default_deco; }
-    const std::string windowMenuFilename() const;
     FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
     // menus
     const FbMenu &rootMenu() const { return *m_rootmenu.get(); }