add ustring.i which wraps otk::ustring for to/from python conversions

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index 6f768502d60f94c8901095811e4ce48887724949..59dbecdd20bc32396eb381e5a9597fbbe17e6903 100644 (file)
--- 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; }
 %};
 
 %{
@@ -96,7 +96,7 @@ void python_callback(PyObject *func, KeyData *data)
 %}
 %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);