aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormarkt <markt>2006-07-13 06:45:29 (GMT)
committermarkt <markt>2006-07-13 06:45:29 (GMT)
commitd32a7af7e6540221edbf43cee7b89a36e0755a66 (patch)
treec1681b79fda33ec5fc213cabac77856e2183c83b /src/Screen.cc
parente44da5f926c5e61818a130071ecaa5a41d900fc2 (diff)
downloadfluxbox_pavel-d32a7af7e6540221edbf43cee7b89a36e0755a66.zip
fluxbox_pavel-d32a7af7e6540221edbf43cee7b89a36e0755a66.tar.bz2
remove lock from RootTheme and redundant loadTheme from fluxbox
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c54338d..20fc755 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -442,11 +442,9 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
442 // else the focus label doesn't get updated 442 // else the focus label doesn't get updated
443 // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme 443 // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme
444 // This must be fixed in the future. 444 // This must be fixed in the future.
445 m_root_theme->lock(true);
446 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), 445 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
447 fluxbox->getStyleOverlayFilename(), 446 fluxbox->getStyleOverlayFilename(),
448 m_root_theme->screenNum()); 447 m_root_theme->screenNum());
449 m_root_theme->lock(false);
450 m_root_theme->setLineAttributes(*resource.gc_line_width, 448 m_root_theme->setLineAttributes(*resource.gc_line_width,
451 *resource.gc_line_style, 449 *resource.gc_line_style,
452 *resource.gc_cap_style, 450 *resource.gc_cap_style,