diff options
author | mathias <mathias> | 2005-04-25 09:43:31 (GMT) |
---|---|---|
committer | mathias <mathias> | 2005-04-25 09:43:31 (GMT) |
commit | b49432be05c6cf748e662e196778463e2190b4c3 (patch) | |
tree | 38b681e6acbdf8b3768bc7f0d14c85ad5bfe28d5 /src | |
parent | adc88698fb66789c5fdab8773c0364dd5c114eff (diff) | |
download | fluxbox_paul-b49432be05c6cf748e662e196778463e2190b4c3.zip fluxbox_paul-b49432be05c6cf748e662e196778463e2190b4c3.tar.bz2 |
we are fluxbox, not blackbox.
Diffstat (limited to 'src')
-rw-r--r-- | src/fluxbox.cc | 12 |
1 files 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() { | |||
1642 | 1642 | ||
1643 | void Fluxbox::real_reconfigure() { | 1643 | void Fluxbox::real_reconfigure() { |
1644 | 1644 | ||
1645 | XrmDatabase new_blackboxrc = (XrmDatabase) 0; | 1645 | XrmDatabase new_fluxboxrc = (XrmDatabase) 0; |
1646 | 1646 | ||
1647 | string dbfile(getRcFilename()); | 1647 | string dbfile(getRcFilename()); |
1648 | XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.c_str()); | 1648 | XrmDatabase old_fluxboxrc = XrmGetFileDatabase(dbfile.c_str()); |
1649 | 1649 | ||
1650 | XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); | 1650 | XrmMergeDatabases(new_fluxboxrc, &old_fluxboxrc); |
1651 | XrmPutFileDatabase(old_blackboxrc, dbfile.c_str()); | 1651 | XrmPutFileDatabase(old_fluxboxrc, dbfile.c_str()); |
1652 | 1652 | ||
1653 | if (old_blackboxrc) | 1653 | if (old_fluxboxrc) |
1654 | XrmDestroyDatabase(old_blackboxrc); | 1654 | XrmDestroyDatabase(old_fluxboxrc); |
1655 | 1655 | ||
1656 | ScreenList::iterator screen_it = m_screen_list.begin(); | 1656 | ScreenList::iterator screen_it = m_screen_list.begin(); |
1657 | ScreenList::iterator screen_it_end = m_screen_list.end(); | 1657 | ScreenList::iterator screen_it_end = m_screen_list.end(); |