X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.cc;h=d464ebbc5234a72cf3c59419dbee4f7c728d198b;hb=213df2814b002da2c5f324210d44559f9d651e21;hp=e4df70e15f4a157cb69f8d7dc8ed39cc627fd611;hpb=e936cba57ee8d749d7c559dadff1ba09e886d2ec;p=chaz%2Fopenbox diff --git a/src/config.cc b/src/config.cc index e4df70e1..d464ebbc 100644 --- a/src/config.cc +++ b/src/config.cc @@ -8,6 +8,8 @@ extern "C" { #include } +#include + namespace ob { static PyObject *obdict = NULL; @@ -25,8 +27,9 @@ bool python_get_string(const char *name, otk::ustring *value) { PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); if (!(val && PyString_Check(val))) return false; - - *value = PyString_AsString(val); + + std::string temp(PyString_AsString(val), PyString_Size(val)); + *value = temp; return true; } @@ -52,8 +55,7 @@ Config::Config() PyObject *obmodule = PyImport_AddModule("config"); obdict = PyModule_GetDict(obmodule); - std::vector names; - python_get_stringlist("DESKTOP_NAMES", &names); + python_get_stringlist("DESKTOP_NAMES", &desktop_names); python_get_string("THEME", &theme); @@ -68,4 +70,8 @@ Config::Config() num_desktops = 1; } +Config::~Config() +{ +} + }