nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont need to XrmInit outside of the Config class. fix indenting.

Browse source
This commit is contained in:
Dana Jansens 2002-07-07 20:38:00 +00:00
parent abb124bdb2
commit 1da5287620
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Screen.cc
View file

@ -727,7 +727,7 @@ void BScreen::rereadMenu(void) {
void BScreen::LoadStyle(void) { void BScreen::LoadStyle(void) {
Configuration style; Configuration style(False);
const char *sfile = blackbox->getStyleFilename(); const char *sfile = blackbox->getStyleFilename();
if (sfile != NULL) { if (sfile != NULL) {
@ -741,6 +741,23 @@ void BScreen::LoadStyle(void) {
string s; string s;
if (config->getValue("rootCommand", s))
printf("config.rootCommand: %s\n", s.c_str());
if (style.getValue("rootCommand", s))
printf("style.rootCommand: %s\n", s.c_str());
// merge in the rc file
style.merge(config, True);
printf("merged databases\n");
if (style.getValue("rootCommand", s))
printf("style.rootCommand: %s\n", s.c_str());
if (style.getValue("session.cacheMax", s))
printf("session.cacheMax: %s\n", s.c_str());
// load fonts/fontsets // load fonts/fontsets
if (resource.wstyle.font) if (resource.wstyle.font)
delete resource.wstyle.font; delete resource.wstyle.font;