use the byte size for utf strings, not the character size

[chaz/openbox] / src / python.hh

diff --git a/src/python.hh b/src/python.hh
index 8b41f00bfbd2a359628ff1be86fb05821d14e1eb..a2cfa366772e32d3284b4b9a3696447ff39eea9a 100644 (file)
--- a/src/python.hh
+++ b/src/python.hh
@@ -10,6 +10,7 @@
 #include "otk/rect.hh"
 #include "otk/property.hh"
 #include "otk/display.hh"
+#include "otk/ustring.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -153,7 +154,7 @@ public:
     this->client = client;
     this->time   = time;
     this->state  = state;
-    this->key    = XKeysymToString(XKeycodeToKeysym(otk::Display::display,
+    this->key    = XKeysymToString(XKeycodeToKeysym(**otk::display,
                                                     key, 0));
   }
 };
@@ -165,8 +166,8 @@ void python_destroy();
 bool python_exec(const std::string &path);
 
 bool python_get_long(const char *name, long *value);
-bool python_get_string(const char *name, std::string *value);
-bool python_get_stringlist(const char *name, std::vector<std::string> *value);
+bool python_get_string(const char *name, otk::ustring *value);
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value);
 
 /***********************************************
  * These are found in openbox.i, not python.cc *