aboutsummaryrefslogtreecommitdiff
path: root/src/SystemTray.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-04-29 08:52:28 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commitf7d7dfd2a8047207dbe90bc77592c25acf4ca15c (patch)
tree46eb8596d15fb0450f07e3e5d58e2c5449c4c020 /src/SystemTray.cc
parent54230c9a4474baf4f1c56773992212093e222349 (diff)
downloadfluxbox_pavel-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.zip
fluxbox_pavel-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.tar.bz2
Convert FbTk::Theme::reconfigSig and friends to the new Signal system
I removed the const versions of reconfigSig() in the process since FbTk::Signal has no const methods anyway.
Diffstat (limited to 'src/SystemTray.cc')
-rw-r--r--src/SystemTray.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index a8c4d5d..66e350f 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -25,7 +25,6 @@
25#include "FbTk/ImageControl.hh" 25#include "FbTk/ImageControl.hh"
26#include "FbTk/TextUtils.hh" 26#include "FbTk/TextUtils.hh"
27#include "FbTk/MemFun.hh" 27#include "FbTk/MemFun.hh"
28#include "FbTk/SimpleObserver.hh"
29 28
30#include "AtomHandler.hh" 29#include "AtomHandler.hh"
31#include "fluxbox.hh" 30#include "fluxbox.hh"
@@ -167,11 +166,10 @@ SystemTray::SystemTray(const FbTk::FbWindow& parent,
167 FbTk::EventManager::instance()->add(*this, m_window); 166 FbTk::EventManager::instance()->add(*this, m_window);
168 FbTk::EventManager::instance()->add(*this, m_selection_owner); 167 FbTk::EventManager::instance()->add(*this, m_selection_owner);
169 // setup signals 168 // setup signals
170 m_observer.reset(makeObserver(*this, &SystemTray::update)); 169 join(m_theme->reconfigSig(), FbTk::MemFun(*this, &SystemTray::update));
171 m_theme->reconfigSig().attach(m_observer.get());
172 170
173 join(screen.bgChangeSig(), 171 join(screen.bgChangeSig(),
174 FbTk::MemFun(*this, &SystemTray::updateForScreen)); 172 FbTk::MemFunIgnoreArgs(*this, &SystemTray::update));
175 173
176 174
177 Fluxbox* fluxbox = Fluxbox::instance(); 175 Fluxbox* fluxbox = Fluxbox::instance();