diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-01-13 05:54:40 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-01-13 05:54:40 +0000 |
| commit | ef02a0c8ae65f169157c90064a335303e964a4c1 (patch) | |
| tree | f1a1bf6cfe05ee11545bfa811f5a2582e1906dce /src/screen.cc | |
| parent | 5a90d2b671f01f29043ab82f909440de0abfa362 (diff) | |
almost done the ustring conversion
Diffstat (limited to 'src/screen.cc')
| -rw-r--r-- | src/screen.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/screen.cc b/src/screen.cc index 763931f8..c211df12 100644 --- a/src/screen.cc +++ b/src/screen.cc @@ -82,10 +82,10 @@ Screen::Screen(int screen) // initialize the screen's style _style.setImageControl(_image_control); - std::string stylepath; + otk::ustring stylepath; python_get_string("theme", &stylepath); otk::Configuration sconfig(false); - sconfig.setFile(otk::expandTilde(stylepath)); + sconfig.setFile(otk::expandTilde(stylepath.c_str())); if (!sconfig.load()) { sconfig.setFile(otk::expandTilde(DEFAULTSTYLE)); if (!sconfig.load()) { @@ -107,7 +107,7 @@ Screen::Screen(int screen) geometry, 2); // Set the net_desktop_names property - std::vector<std::string> names; + std::vector<otk::ustring> names; python_get_stringlist("desktop_names", &names); Openbox::instance->property()->set(_info->rootWindow(), otk::Property::net_desktop_names, @@ -710,7 +710,7 @@ void Screen::updateDesktopNames() } -void Screen::setDesktopName(long i, const std::string &name) +void Screen::setDesktopName(long i, const otk::ustring &name) { assert(i >= 0); |