From d32a7af7e6540221edbf43cee7b89a36e0755a66 Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Thu, 13 Jul 2006 06:45:29 +0000
Subject: remove lock from RootTheme and redundant loadTheme from fluxbox

---
 ChangeLog        | 2 ++
 src/RootTheme.cc | 4 ----
 src/RootTheme.hh | 3 ---
 src/Screen.cc    | 2 --
 src/fluxbox.cc   | 2 --
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cac729e..9ed16b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *06/07/13:
+   * Remove some redundant code for loading styles (Mark)
+     fluxbox.cc Screen.cc RootTheme.cc/hh
    * Fix background: random (Mark)
      RootTheme.cc
 *06/07/10:
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,
     m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())),
     m_root_command(root_command),
     m_image_ctrl(image_control),
-    m_lock(false),
     m_background_loaded(true) {
 
     Display *disp = FbTk::App::instance()->display();
@@ -138,9 +137,6 @@ bool RootTheme::fallback(FbTk::ThemeItem_base &item) {
 void RootTheme::reconfigTheme() {
     _FB_USES_NLS;
 
-    if (m_lock)
-        return;
-
     // if user specified background in the config then use it
     // instead of style background
     if (!m_root_command.empty()) {
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 7136ea0..8bd2841 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -61,14 +61,11 @@ public:
         m_opgc.setLineAttributes(width, line_style, cap_style, join_style);
     }
     
-    //!! TODO we should need this later
-    void lock(bool value) { m_lock = value; }
 private:
     BackgroundItem *m_background;///< background image/texture
     FbTk::GContext m_opgc;
     const std::string &m_root_command;
     FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture
-    bool m_lock; ///< reconfigure lock
     bool m_background_loaded; ///< whether or not the background is present in the style file
 
 };
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,
     // else the focus label doesn't get updated
     // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme
     // This must be fixed in the future.
-    m_root_theme->lock(true);
     FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
                                         fluxbox->getStyleOverlayFilename(),
                                         m_root_theme->screenNum());
-    m_root_theme->lock(false);
     m_root_theme->setLineAttributes(*resource.gc_line_width,
                                     *resource.gc_line_style,
                                     *resource.gc_cap_style,
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 737eda2..ccc7f8d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -291,8 +291,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
 #endif // HAVE_RANDR
 
     load_rc();
-    // setup theme manager to have our style file ready to be scanned
-    FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());
 
     // setup atom handlers before we create any windows
 #ifdef REMEMBER
-- 
cgit v0.11.2