5 files changed, 11 insertions, 12 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 48636ce..da5760d 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -36,6 +36,7 @@
 #include "MenuItem.hh"
 #include "MenuSeparator.hh"
 #include "ImageControl.hh"
+#include "MemFun.hh"
 #include "MenuTheme.hh"
 #include "App.hh"
 #include "EventManager.hh"
@@ -121,7 +122,7 @@ Menu::Menu(FbTk::ThemeProxy<MenuTheme> &tm, ImageControl &imgctrl):
     m_hide_timer.fireOnce(true);
 
     // make sure we get updated when the theme is reloaded
-    tm.reconfigSig().attach(this);
+    m_tracker.join(tm.reconfigSig(), MemFun(*this, &Menu::themeReconfigured));
 
     m_title_vis = true;
 
@@ -1244,7 +1245,6 @@ void Menu::update(FbTk::Subject *subj) {
     reconfigure();
 }
 
-
 void Menu::setScreen(int x, int y, int w, int h) {
     m_screen_x = x;
     m_screen_y = y;
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index f3ec820..7b59cf7 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -195,6 +195,7 @@ private:
     void closeMenu();
     void startHide();
     void stopHide();
+    void themeReconfigured() { update(NULL); }
 
     FbTk::ThemeProxy<MenuTheme> &m_theme;
     Menu *m_parent;
@@ -261,6 +262,8 @@ private:
     bool m_need_update;
     Timer m_submenu_timer;
     Timer m_hide_timer;
+
+    SignalTracker m_tracker;
 };
 
 } // end namespace FbTk
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index eb19798..b575860 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -130,8 +130,7 @@ public:
             m_hl_selected_pixmap->pixmap().dontFree();
     }
 
-    virtual Subject &reconfigSig() { return Theme::reconfigSig(); }
-    virtual const Subject &reconfigSig() const { return Theme::reconfigSig(); }
+    virtual Signal<void> &reconfigSig() { return Theme::reconfigSig(); }
 
     virtual MenuTheme &operator *() { return *this; }
     virtual const MenuTheme &operator *() const { return *this; }
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index c92e563..c252275 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -56,7 +56,7 @@ struct LoadThemeHelper {
         ThemeManager::ThemeList::iterator it = tmlist.begin();
         ThemeManager::ThemeList::iterator it_end = tmlist.end();
         for (; it != it_end; ++it) {
-            (*it)->reconfigSig().notify();
+            (*it)->reconfigSig().emit();
         }
     }
 
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index c331ba5..c700f9b 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -26,8 +26,8 @@
 #ifndef FBTK_THEME_HH
 #define FBTK_THEME_HH
 
+#include "Signal.hh"
 #include "XrmDatabaseHelper.hh"
-#include "Subject.hh"
 
 #include <string>
 #include <list>
@@ -107,15 +107,13 @@ public:
     template <typename T>
     void remove(ThemeItem<T> &item);
     virtual bool fallback(ThemeItem_base &) { return false; }
-    FbTk::Subject &reconfigSig() { return m_reconfig_sig; }
-    const FbTk::Subject &reconfigSig() const { return m_reconfig_sig; }
-
+    Signal<void> &reconfigSig() { return m_reconfig_sig; }
 
 private:
     const int m_screen_num;
 
     ItemList m_themeitems;
-    FbTk::Subject m_reconfig_sig;
+    Signal<void> m_reconfig_sig;
 };
 
 /// Proxy interface for themes, so they can be substituted dynamically
@@ -124,8 +122,7 @@ class ThemeProxy {
 public:
     virtual ~ThemeProxy() { }
 
-    virtual Subject &reconfigSig() = 0;
-    virtual const Subject &reconfigSig() const = 0;
+    virtual Signal<void> &reconfigSig() = 0;
 
     virtual BaseTheme &operator *() = 0;
     virtual const BaseTheme &operator *() const = 0;