From b49432be05c6cf748e662e196778463e2190b4c3 Mon Sep 17 00:00:00 2001 From: mathias Date: Mon, 25 Apr 2005 09:43:31 +0000 Subject: we are fluxbox, not blackbox. --- src/fluxbox.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fluxbox.cc b/src/fluxbox.cc index dcc947a..bf8e4d6 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -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(); -- cgit v0.11.2