nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apparently, this code did the following:

Browse source 
- 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
This commit is contained in:
markt 2006-12-16 19:10:11 +00:00
parent 3efe68ffe3
commit ecb0d95b8f
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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

11
src/fluxbox.cc
View file

@ -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)