diff options
author | markt <markt> | 2006-12-16 19:10:11 (GMT) |
---|---|---|
committer | markt <markt> | 2006-12-16 19:10:11 (GMT) |
commit | ecb0d95b8fdb98137236dfb17fdf0ebe384b6c29 (patch) | |
tree | 3e4a95504c4a4a6b08bff88c7cde8bd4c8c2b9c9 /src | |
parent | 3efe68ffe30a24169492a97a9a0a883990e68b6a (diff) | |
download | fluxbox-ecb0d95b8fdb98137236dfb17fdf0ebe384b6c29.zip fluxbox-ecb0d95b8fdb98137236dfb17fdf0ebe384b6c29.tar.bz2 |
Apparently, this code did the following:
- create an empty database
- load the rc file into a database
- merge the empty database into the second one
- write the result to the rc file
- delete both databases
Diffstat (limited to 'src')
-rw-r--r-- | src/fluxbox.cc | 11 |
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 | ||
1660 | void Fluxbox::real_reconfigure() { | 1660 | void 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) |