try appending our shit to the path, and not import config in the cc

diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index 8afb114182af2b504d1503a95b76cbdef4440fb9..330870c6c7ad04212a741b9eebfe73449608131c 100644 (file)
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -15,8 +15,8 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
     _file(stylefile)
 {
 // pick one..
-#define FIERON
-//#define MERRY
+//#define FIERON
+#define MERRY
 
 #ifdef FIERON
   _root_color = new RenderColor(_screen, 0x272a2f);

diff --git a/src/python.cc b/src/python.cc
index 2a9a912a2b583bd457b9000bd99078a528bb92a6..2144ab4a6e1a7c6e433043ccbe43d7b735bb9b45 100644 (file)
--- a/src/python.cc
+++ b/src/python.cc
@@ -26,13 +26,13 @@ void python_init(char *argv0)
   // initialize the C python module
   init_otk();
   init_ob();
-  // include the openbox directories for python scripts in the sys path
+  // prepend the openbox directories for python scripts to the sys path
   PyRun_SimpleString("import sys");
-  PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
+  PyRun_SimpleString("sys.path.insert('0, " SCRIPTDIR "')");
+  PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
                                         otk::expandTilde("~/.openbox/python") +
                                         "')").c_str()));
-  PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
-  PyRun_SimpleString("import ob; import otk; import config;");
+  PyRun_SimpleString("import ob; import otk;");// import config;");
   // set up convenience global variables
   PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
   PyRun_SimpleString("otk.display = otk.Display_instance()");