add an optional parameter to restart

[chaz/openbox] / src / python.cc

diff --git a/src/python.cc b/src/python.cc
index 719c667d53871271300b9c134b84a445468cfd84..040d70206d44f26c49103ae7f2c571ed3420d373 100644 (file)
--- a/src/python.cc
+++ b/src/python.cc
@@ -11,8 +11,6 @@
 extern "C" {
 // The initializer in openbox_wrap.cc
 extern void init_openbox(void);
-// The initializer in otk_wrap.cc
-extern void init_otk(void);
 }
 
 namespace ob {
@@ -24,8 +22,7 @@ void python_init(char *argv0)
   // start the python engine
   Py_SetProgramName(argv0);
   Py_Initialize();
-  // initialize the C python modules
-  init_otk();
+  // initialize the C python module
   init_openbox();
   // include the openbox directories for python scripts in the sys path
   PyRun_SimpleString("import sys");
@@ -37,7 +34,6 @@ void python_init(char *argv0)
   PyRun_SimpleString("from openbox import *;");
   // set up convenience global variables
   PyRun_SimpleString("openbox = Openbox_instance()");
-  PyRun_SimpleString("display = OBDisplay_display()");
 
   // set up access to the python global variables
   PyObject *obmodule = PyImport_AddModule("__main__");