X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=f6ed7a7e7dc9bc083dad407faccfc12a9fd234de;hb=55f138186097931f3bf81618e36d2ad53e0c07fd;hp=040d70206d44f26c49103ae7f2c571ed3420d373;hpb=007e17d32b16b1df6c5267c9f8701d315c0c3805;p=chaz%2Fopenbox

diff --git a/src/python.cc b/src/python.cc
index 040d7020..f6ed7a7e 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -27,7 +27,7 @@ void python_init(char *argv0)
   // include the openbox directories for python scripts in the sys path
   PyRun_SimpleString("import sys");
   PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
-  PyRun_SimpleString(const_cast<char*>(((std::string)"sys.path.append('" +
+  PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
                                         otk::expandTilde("~/.openbox/python") +
                                         "')").c_str()));
   // import the otk and openbox modules into the main namespace
@@ -60,13 +60,13 @@ bool python_exec(const std::string &path)
 bool python_get_long(const char *name, long *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
-  if (!(val && PyLong_Check(val))) return false;
+  if (!(val && PyInt_Check(val))) return false;
   
-  *value = PyLong_AsLong(val);
+  *value = PyInt_AsLong(val);
   return true;
 }
 
-bool python_get_string(const char *name, std::string *value)
+bool python_get_string(const char *name, otk::ustring *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
   if (!(val && PyString_Check(val))) return false;
@@ -75,7 +75,7 @@ bool python_get_string(const char *name, std::string *value)
   return true;
 }
 
-bool python_get_stringlist(const char *name, std::vector<std::string> *value)
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
   if (!(val && PyList_Check(val))) return false;
@@ -133,7 +133,7 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func)
     return NULL;
   }
 
-  ob::OBBindings::StringVect vectkeylist;
+  ob::Bindings::StringVect vectkeylist;
   for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
     PyObject *str = PyList_GetItem(keylist, i);
     if (!PyString_Check(str)) {
@@ -163,7 +163,7 @@ PyObject *kunbind(PyObject *keylist, PyObject *func)
     return NULL;
   }
   
-  ob::OBBindings::StringVect vectkeylist;
+  ob::Bindings::StringVect vectkeylist;
   for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
     PyObject *str = PyList_GetItem(keylist, i);
     if (!PyString_Check(str)) {
@@ -195,9 +195,9 @@ PyObject *send_client_msg(Window target, int type, Window about,
                           long data, long data1, long data2,
                           long data3, long data4)
 {
-  if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) {
+  if (type < 0 || type >= otk::Property::NUM_ATOMS) {
       PyErr_SetString(PyExc_TypeError,
-                     "Invalid atom type. Must be from otk::OBProperty::Atoms");
+                     "Invalid atom type. Must be from otk::Property::Atoms");
       return NULL;
   }
   
@@ -205,7 +205,7 @@ PyObject *send_client_msg(Window target, int type, Window about,
   e.xclient.type = ClientMessage;
   e.xclient.format = 32;
   e.xclient.message_type =
-    Openbox::instance->property()->atom((otk::OBProperty::Atoms)type);
+    Openbox::instance->property()->atom((otk::Property::Atoms)type);
   e.xclient.window = about;
   e.xclient.data.l[0] = data;
   e.xclient.data.l[1] = data1;
@@ -213,7 +213,7 @@ PyObject *send_client_msg(Window target, int type, Window about,
   e.xclient.data.l[3] = data3;
   e.xclient.data.l[4] = data4;
 
-  XSendEvent(otk::OBDisplay::display, target, false,
+  XSendEvent(otk::Display::display, target, false,
              SubstructureRedirectMask | SubstructureNotifyMask,
              &e);
   Py_INCREF(Py_None); return Py_None;