aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-12-16 19:10:11 (GMT)
committermarkt <markt>2006-12-16 19:10:11 (GMT)
commitecb0d95b8fdb98137236dfb17fdf0ebe384b6c29 (patch)
tree3e4a95504c4a4a6b08bff88c7cde8bd4c8c2b9c9
parent3efe68ffe30a24169492a97a9a0a883990e68b6a (diff)
downloadfluxbox_pavel-ecb0d95b8fdb98137236dfb17fdf0ebe384b6c29.zip
fluxbox_pavel-ecb0d95b8fdb98137236dfb17fdf0ebe384b6c29.tar.bz2
Apparently, this code did the following:
- create an empty database - load the rc file into a database - merge the empty database into the second one - write the result to the rc file - delete both databases
-rw-r--r--ChangeLog4
-rw-r--r--src/fluxbox.cc11
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/12/16:
4 * Remove useless stuff from code that reloads configuration (Mark)
5 fluxbox.cc
3*06/11/07: 6*06/11/07:
4 * Cosmetic patch from Slava Semushin 7 * Cosmetic patch from Slava Semushin
5 tests/texturetest.cc WorkspaceCmd.cc ToolbarTheme.cc FbTk/Layer.hh 8 tests/texturetest.cc WorkspaceCmd.cc ToolbarTheme.cc FbTk/Layer.hh
6 FbTk/MultLayers.cc FbTk/Image.cc FbTk/TextBox.cc Shape.cc ClientPattern.cc 9 FbTk/MultLayers.cc FbTk/Image.cc FbTk/TextBox.cc Shape.cc ClientPattern.cc
7 FbWinFrame.cc 10 FbWinFrame.cc
8
9*06/10/30: 11*06/10/30:
10 * Cosmetic patch from Slava Semushin 12 * Cosmetic patch from Slava Semushin
11 CommandDialog.cc Ewmh.cc FbCommands.cc FbAtoms.cc Xutil.cc Gnome.cc 13 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() {
1659 1659
1660void Fluxbox::real_reconfigure() { 1660void Fluxbox::real_reconfigure() {
1661 1661
1662 XrmDatabase new_fluxboxrc = (XrmDatabase) 0;
1663
1664 string dbfile(getRcFilename());
1665 XrmDatabase old_fluxboxrc = XrmGetFileDatabase(dbfile.c_str());
1666
1667 XrmMergeDatabases(new_fluxboxrc, &old_fluxboxrc);
1668 XrmPutFileDatabase(old_fluxboxrc, dbfile.c_str());
1669
1670 if (old_fluxboxrc)
1671 XrmDestroyDatabase(old_fluxboxrc);
1672
1673 ScreenList::iterator screen_it = m_screen_list.begin(); 1662 ScreenList::iterator screen_it = m_screen_list.begin();
1674 ScreenList::iterator screen_it_end = m_screen_list.end(); 1663 ScreenList::iterator screen_it_end = m_screen_list.end();
1675 for (; screen_it != screen_it_end; ++screen_it) 1664 for (; screen_it != screen_it_end; ++screen_it)