we are fluxbox, not blackbox.

This commit is contained in:
mathias 2005-04-25 09:43:31 +00:00
parent adc88698fb
commit b49432be05

View file

@ -1642,16 +1642,16 @@ void Fluxbox::reconfigure() {
void Fluxbox::real_reconfigure() {
XrmDatabase new_blackboxrc = (XrmDatabase) 0;
XrmDatabase new_fluxboxrc = (XrmDatabase) 0;
string dbfile(getRcFilename());
XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.c_str());
XrmDatabase old_fluxboxrc = XrmGetFileDatabase(dbfile.c_str());
XrmMergeDatabases(new_blackboxrc, &old_blackboxrc);
XrmPutFileDatabase(old_blackboxrc, dbfile.c_str());
XrmMergeDatabases(new_fluxboxrc, &old_fluxboxrc);
XrmPutFileDatabase(old_fluxboxrc, dbfile.c_str());
if (old_blackboxrc)
XrmDestroyDatabase(old_blackboxrc);
if (old_fluxboxrc)
XrmDestroyDatabase(old_fluxboxrc);
ScreenList::iterator screen_it = m_screen_list.begin();
ScreenList::iterator screen_it_end = m_screen_list.end();