X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=657e31b741e2640a4e6c70a74ee67b5b626f73dd;hb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;hp=edc29ae82303c0081fefc2a62a8b211c2b340b4f;hpb=77ab46d1e35d48e73c201e6de88b26f48bb06425;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index edc29ae8..657e31b7 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -20,9 +20,9 @@
 //%include std_list.i
 //%template(ClientList) std::list<Client*>;
 
-%ignore ob::Openbox::instance;
+%ignore ob::openbox;
 %inline %{
-  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+  ob::Openbox *Openbox_instance() { return ob::openbox; }
 %};
 
 %{
@@ -90,13 +90,15 @@ void python_callback(PyObject *func, KeyData *data)
 }
 %}
 
+#ignore ob::openbox;
+
 %ignore ob::Screen::clients;
 %{
   #include <iterator>
 %}
 %extend ob::Screen {
   Client *client(int i) {
-    if (i >= (int)self->clients.size())
+    if (i < 0 || i >= (int)self->clients.size())
       return NULL;
     ob::Client::List::iterator it = self->clients.begin();
     std::advance(it,i);
@@ -107,11 +109,13 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%ignore otk::Display::display;
+%ignore otk::display;
 %inline %{
-  Display *Display_display() { return otk::Display::display; }
+  otk::Display *Display_instance() { return otk::display; }
 %};
 
+%include "../otk/ustring.i"
+
 %include "../otk/display.hh"
 %include "../otk/point.hh"
 %include "../otk/property.hh"