summaryrefslogtreecommitdiff
path: root/src/openbox_wrap.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-13 08:13:58 +0000
committerDana Jansens <danakj@orodu.net>2003-01-13 08:13:58 +0000
commit9e77a88d269bfafb78e56a646bfacebdd6ff4c5a (patch)
treeee8dba749b3a6f1eaa21cf47b01ac4be11931455 /src/openbox_wrap.cc
parent4dba699857918d0feda52c71c58eccd08839ec8b (diff)
move the Openbox::instance pointer to simply "openbox".
Diffstat (limited to 'src/openbox_wrap.cc')
-rw-r--r--src/openbox_wrap.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openbox_wrap.cc b/src/openbox_wrap.cc
index e26d59e1..d098ed8b 100644
--- a/src/openbox_wrap.cc
+++ b/src/openbox_wrap.cc
@@ -813,7 +813,7 @@ std::string SwigString_AsString(PyObject* o) {
#include <stdexcept>
- ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+ ob::Openbox *Openbox_instance() { return ob::openbox; }
namespace ob {
@@ -889,7 +889,7 @@ void python_callback(PyObject *func, KeyData *data)
#include "ustring.hh"
ob::Client *ob_Screen_client(ob::Screen *self,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);