we are fluxbox, not blackbox.
This commit is contained in:
parent
adc88698fb
commit
b49432be05
1 changed files with 6 additions and 6 deletions
|
@ -1642,16 +1642,16 @@ void Fluxbox::reconfigure() {
|
||||||
|
|
||||||
void Fluxbox::real_reconfigure() {
|
void Fluxbox::real_reconfigure() {
|
||||||
|
|
||||||
XrmDatabase new_blackboxrc = (XrmDatabase) 0;
|
XrmDatabase new_fluxboxrc = (XrmDatabase) 0;
|
||||||
|
|
||||||
string dbfile(getRcFilename());
|
string dbfile(getRcFilename());
|
||||||
XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.c_str());
|
XrmDatabase old_fluxboxrc = XrmGetFileDatabase(dbfile.c_str());
|
||||||
|
|
||||||
XrmMergeDatabases(new_blackboxrc, &old_blackboxrc);
|
XrmMergeDatabases(new_fluxboxrc, &old_fluxboxrc);
|
||||||
XrmPutFileDatabase(old_blackboxrc, dbfile.c_str());
|
XrmPutFileDatabase(old_fluxboxrc, dbfile.c_str());
|
||||||
|
|
||||||
if (old_blackboxrc)
|
if (old_fluxboxrc)
|
||||||
XrmDestroyDatabase(old_blackboxrc);
|
XrmDestroyDatabase(old_fluxboxrc);
|
||||||
|
|
||||||
ScreenList::iterator screen_it = m_screen_list.begin();
|
ScreenList::iterator screen_it = m_screen_list.begin();
|
||||||
ScreenList::iterator screen_it_end = m_screen_list.end();
|
ScreenList::iterator screen_it_end = m_screen_list.end();
|
||||||
|
|
Loading…
Reference in a new issue