1 files changed, 6 insertions, 5 deletions

diff --git a/src/SystemTray.hh b/src/SystemTray.hh
index 3215e31..132069a 100644
--- a/src/SystemTray.hh
+++ b/src/SystemTray.hh
@@ -25,12 +25,12 @@
 
 #include "FbTk/FbWindow.hh"
 #include "FbTk/EventHandler.hh"
-#include "FbTk/Observer.hh"
 
 #include "ToolTheme.hh"
 #include "ToolbarItem.hh"
 
 #include <list>
+#include <memory>
 
 class BScreen;
 class ButtonTheme;
@@ -39,9 +39,10 @@ class AtomHandler;
 
 namespace FbTk {
 template <class T> class ThemeProxy;
+class Observer;
 }
 
-class SystemTray: public ToolbarItem, public FbTk::EventHandler, public FbTk::Observer {
+class SystemTray: public ToolbarItem, public FbTk::EventHandler {
 public:
 
     explicit SystemTray(const FbTk::FbWindow &parent,
@@ -75,7 +76,7 @@ public:
         m_window.setBorderWidth(m_theme->border().width());
         m_window.setBorderColor(m_theme->border().color());
         m_window.setAlpha(alpha); 
-        update(0); 
+        update(); 
     }
     void updateSizing() { m_window.setBorderWidth(m_theme->border().width()); }
 
@@ -85,7 +86,7 @@ public:
 
 private:
 
-    void update(FbTk::Subject *subj);
+    void update();
 
     typedef std::list<TrayWindow *> ClientList;
     ClientList::iterator findClient(Window win);
@@ -108,7 +109,7 @@ private:
     // gaim/pidgin seems to barf if the selection is not an independent window.
     // I suspect it's an interacton with parent relationship and gdk window caching.
     FbTk::FbWindow m_selection_owner;
-
+    std::auto_ptr<FbTk::Observer> m_observer;
 };
 
 #endif // SYSTEMTRAY_HH