X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=9ff1f2b7a14414ce24adbcb86d943edf8512f2b9;hb=1c97e9fb7bede1607b9680d29a791a72b1768019;hp=56aa99d916647c04dadf1088acb8d7de3e502413;hpb=1cd253f4684ee126340fae38094b637f1b0010ea;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 56aa99d9..9ff1f2b7 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -64,8 +64,10 @@ Screen::Screen(int screen)
   _managed = !::running;
   if (! _managed) return; // was unable to manage the screen
 
+#ifdef DEBUG
   printf(_("Managing screen %d: visual 0x%lx, depth %d\n"),
          _number, XVisualIDFromVisual(_info->visual()), _info->depth());
+#endif
 
   otk::Property::set(_info->rootWindow(), otk::Property::atoms.openbox_pid,
                      otk::Property::atoms.cardinal, (unsigned long) getpid());
@@ -77,7 +79,7 @@ Screen::Screen(int screen)
   // XXX: initialize the screen's style
   /*
   otk::ustring stylepath;
-  python_get_string("theme", &stylepath);
+  python_get_string("THEME", &stylepath);
   otk::Configuration sconfig(false);
   sconfig.setFile(otk::expandTilde(stylepath.c_str()));
   if (!sconfig.load()) {
@@ -103,7 +105,7 @@ Screen::Screen(int screen)
 
   // Set the net_desktop_names property
   std::vector<otk::ustring> names;
-  python_get_stringlist("desktop_names", &names);
+  python_get_stringlist("DESKTOP_NAMES", &names);
   otk::Property::set(_info->rootWindow(),
                      otk::Property::atoms.net_desktop_names,
                      otk::Property::utf8, names);
@@ -112,7 +114,7 @@ Screen::Screen(int screen)
 
   _desktop = 0;
   
-  if (!python_get_long("number_of_desktops", &_num_desktops))
+  if (!python_get_long("NUMBER_OF_DESKTOPS", &_num_desktops))
     _num_desktops = 1;
   changeNumDesktops(_num_desktops); // set the hint
 
@@ -806,7 +808,6 @@ void Screen::setDesktopName(long i, const otk::ustring &name)
 
 void Screen::installColormap(bool install) const
 {
-  printf("%snstalling Root Colormap!\n", install ? "I" : "Uni");
   if (install)
     XInstallColormap(**otk::display, _info->colormap());
   else