aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-08-05 11:18:55 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:13:12 (GMT)
commit428ca1193dd6be20ea6eba152041f0a1222e9c48 (patch)
treed5b64d38a0e5fa89964acf2449a876b7d2ec23e1
parent76855f197979cb8b1fe59c208d65e080cf19081a (diff)
downloadfluxbox_paul-428ca1193dd6be20ea6eba152041f0a1222e9c48.zip
fluxbox_paul-428ca1193dd6be20ea6eba152041f0a1222e9c48.tar.bz2
Remove theme reconfig handlers in iconbartool
as far as i can tell, they weren't doing anything and I observed no issues after removing them.
-rw-r--r--src/IconbarTool.cc11
-rw-r--r--src/IconbarTool.hh2
2 files changed, 1 insertions, 12 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 73f0003..a912030 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -270,12 +270,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
270 menu.insert(m_menu->label().logical(), FbTk::RefCount<FbTk::Menu>(m_menu)); 270 menu.insert(m_menu->label().logical(), FbTk::RefCount<FbTk::Menu>(m_menu));
271 271
272 // setup signals 272 // setup signals
273 m_tracker.join(theme.reconfigSig(), FbTk::MemFun(*this, &IconbarTool::themeReconfigured)); 273 setMode(*m_rc_mode);
274 m_tracker.join(focused_theme.reconfigSig(),
275 FbTk::MemFun(*this, &IconbarTool::themeReconfigured));
276 m_tracker.join(unfocused_theme.reconfigSig(),
277 FbTk::MemFun(*this, &IconbarTool::themeReconfigured));
278 themeReconfigured();
279} 274}
280 275
281IconbarTool::~IconbarTool() { 276IconbarTool::~IconbarTool() {
@@ -366,10 +361,6 @@ unsigned int IconbarTool::borderWidth() const {
366 return m_icon_container.borderWidth(); 361 return m_icon_container.borderWidth();
367} 362}
368 363
369void IconbarTool::themeReconfigured() {
370 setMode(*m_rc_mode);
371}
372
373void IconbarTool::update(UpdateReason reason, Focusable *win) { 364void IconbarTool::update(UpdateReason reason, Focusable *win) {
374 // ignore updates if we're shutting down 365 // ignore updates if we're shutting down
375 if (m_screen.isShuttingdown()) { 366 if (m_screen.isShuttingdown()) {
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh
index 9091a91..6ce3c35 100644
--- a/src/IconbarTool.hh
+++ b/src/IconbarTool.hh
@@ -97,8 +97,6 @@ private:
97 /// called when the list emits a signal 97 /// called when the list emits a signal
98 void update(UpdateReason reason, Focusable *win); 98 void update(UpdateReason reason, Focusable *win);
99 99
100 void themeReconfigured();
101
102 BScreen &m_screen; 100 BScreen &m_screen;
103 FbTk::Container m_icon_container; 101 FbTk::Container m_icon_container;
104 IconbarTheme &m_theme; 102 IconbarTheme &m_theme;