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

diff --git a/src/Screen.cc b/src/Screen.cc
index c82ab07c6224c660fcc4a87ce37f8c8094ecc03a..3a94a4a57cac901d1f9d75af6bede61c4891a236 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -727,7 +727,7 @@ void BScreen::rereadMenu(void) {
 
 
 void BScreen::LoadStyle(void) {
-  Configuration style;
+  Configuration style(False);
 
   const char *sfile = blackbox->getStyleFilename();
   if (sfile != NULL) {
@@ -741,6 +741,23 @@ void BScreen::LoadStyle(void) {
 
   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
   if (resource.wstyle.font)
     delete resource.wstyle.font;