2 files changed, 3 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d58fba..e35795e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,13 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
+*06/12/16:
+   * Remove useless stuff from code that reloads configuration (Mark)
+     fluxbox.cc
 *06/11/07:
    * Cosmetic patch from Slava Semushin
      tests/texturetest.cc WorkspaceCmd.cc ToolbarTheme.cc FbTk/Layer.hh
      FbTk/MultLayers.cc FbTk/Image.cc FbTk/TextBox.cc Shape.cc ClientPattern.cc
      FbWinFrame.cc
-
 *06/10/30:
    * Cosmetic patch from Slava Semushin
      CommandDialog.cc Ewmh.cc FbCommands.cc FbAtoms.cc Xutil.cc Gnome.cc
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 6827ca3..fdc5d37 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1659,17 +1659,6 @@ void Fluxbox::reconfigure() {
 
 void Fluxbox::real_reconfigure() {
 
-    XrmDatabase new_fluxboxrc = (XrmDatabase) 0;
-
-    string dbfile(getRcFilename());
-    XrmDatabase old_fluxboxrc = XrmGetFileDatabase(dbfile.c_str());
-
-    XrmMergeDatabases(new_fluxboxrc, &old_fluxboxrc);
-    XrmPutFileDatabase(old_fluxboxrc, dbfile.c_str());
-
-    if (old_fluxboxrc)
-        XrmDestroyDatabase(old_fluxboxrc);
-
     ScreenList::iterator screen_it = m_screen_list.begin();
     ScreenList::iterator screen_it_end = m_screen_list.end();
     for (; screen_it != screen_it_end; ++screen_it)