diff options
author | markt <markt> | 2006-07-13 06:45:29 (GMT) |
---|---|---|
committer | markt <markt> | 2006-07-13 06:45:29 (GMT) |
commit | d32a7af7e6540221edbf43cee7b89a36e0755a66 (patch) | |
tree | c1681b79fda33ec5fc213cabac77856e2183c83b /src/RootTheme.cc | |
parent | e44da5f926c5e61818a130071ecaa5a41d900fc2 (diff) | |
download | fluxbox_lack-d32a7af7e6540221edbf43cee7b89a36e0755a66.zip fluxbox_lack-d32a7af7e6540221edbf43cee7b89a36e0755a66.tar.bz2 |
remove lock from RootTheme and redundant loadTheme from fluxbox
Diffstat (limited to 'src/RootTheme.cc')
-rw-r--r-- | src/RootTheme.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc index 19e8c8d..61c7b65 100644 --- a/src/RootTheme.cc +++ b/src/RootTheme.cc | |||
@@ -109,7 +109,6 @@ RootTheme::RootTheme(const std::string &root_command, | |||
109 | m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), | 109 | m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), |
110 | m_root_command(root_command), | 110 | m_root_command(root_command), |
111 | m_image_ctrl(image_control), | 111 | m_image_ctrl(image_control), |
112 | m_lock(false), | ||
113 | m_background_loaded(true) { | 112 | m_background_loaded(true) { |
114 | 113 | ||
115 | Display *disp = FbTk::App::instance()->display(); | 114 | Display *disp = FbTk::App::instance()->display(); |
@@ -138,9 +137,6 @@ bool RootTheme::fallback(FbTk::ThemeItem_base &item) { | |||
138 | void RootTheme::reconfigTheme() { | 137 | void RootTheme::reconfigTheme() { |
139 | _FB_USES_NLS; | 138 | _FB_USES_NLS; |
140 | 139 | ||
141 | if (m_lock) | ||
142 | return; | ||
143 | |||
144 | // if user specified background in the config then use it | 140 | // if user specified background in the config then use it |
145 | // instead of style background | 141 | // instead of style background |
146 | if (!m_root_command.empty()) { | 142 | if (!m_root_command.empty()) { |