update to cleaned up otk api

[chaz/openbox] / src / python_client.cc

diff --git a/src/python_client.cc b/src/python_client.cc
index 5ab86b6cdb87f5eba43130d8b2c076bd0e103543..86c738d98dd4531154bb645b5b7cbe2b8a5e9ca0 100644 (file)
--- a/src/python_client.cc
+++ b/src/python_client.cc
@@ -11,26 +11,17 @@ namespace ob {
 
 extern "C" {
 
-PyObject *get_client_dict(PyObject* self, PyObject* args)
-{
-  if (!PyArg_ParseTuple(args, ":get_client_dict"))
-    return NULL;
-  return PyDictProxy_New((PyObject*)Openbox::instance->pyclients());
-}
-
-
-
 PyObject *getWindow(PyObject* self, PyObject* args)
 {
   if (!PyArg_ParseTuple(args, ":getWindow"))
     return NULL;
-  return PyLong_FromLong(((PyClientObject*)self)->window);
+  return PyLong_FromLong(((PyClientObject*)self)->client->window());
 }
 
 
 
 static PyMethodDef attr_methods[] = {
-  {"getWindow", getWindow, METH_VARARGS,
+  {"getWindow", (PyCFunction)getWindow, METH_VARARGS,
    "Return the window id."},
   {NULL, NULL, 0, NULL}           /* sentinel */
 };