From: Dana Jansens <danakj@orodu.net>
Date: Sun, 7 Jul 2002 20:38:00 +0000 (+0000)
Subject: dont need to XrmInit outside of the Config class. fix indenting.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=1da5287620ed531e1f4a531bcc777a6392572c87;p=chaz%2Fopenbox

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

diff --git a/src/Screen.cc b/src/Screen.cc
index c82ab07c..3a94a4a5 100644
--- 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;