aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fluxbox.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 6827ca3..fdc5d37 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1659,17 +1659,6 @@ void Fluxbox::reconfigure() {
1659 1659
1660void Fluxbox::real_reconfigure() { 1660void Fluxbox::real_reconfigure() {
1661 1661
1662 XrmDatabase new_fluxboxrc = (XrmDatabase) 0;
1663
1664 string dbfile(getRcFilename());
1665 XrmDatabase old_fluxboxrc = XrmGetFileDatabase(dbfile.c_str());
1666
1667 XrmMergeDatabases(new_fluxboxrc, &old_fluxboxrc);
1668 XrmPutFileDatabase(old_fluxboxrc, dbfile.c_str());
1669
1670 if (old_fluxboxrc)
1671 XrmDestroyDatabase(old_fluxboxrc);
1672
1673 ScreenList::iterator screen_it = m_screen_list.begin(); 1662 ScreenList::iterator screen_it = m_screen_list.begin();
1674 ScreenList::iterator screen_it_end = m_screen_list.end(); 1663 ScreenList::iterator screen_it_end = m_screen_list.end();
1675 for (; screen_it != screen_it_end; ++screen_it) 1664 for (; screen_it != screen_it_end; ++screen_it)