// 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()) {
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,
// we have a list of desktop names
if (!python_get_long("number_of_desktops", &_num_desktops))
- _num_desktops = 4;
+ _num_desktops = 1;
changeNumDesktops(_num_desktops); // set the hint
_desktop = 0;
void Screen::changeDesktop(long desktop)
{
- assert(desktop >= 0 && desktop < _num_desktops);
-
if (!(desktop >= 0 && desktop < _num_desktops)) return;
printf("Moving to desktop %ld\n", desktop);
}
-void Screen::setDesktopName(long i, const std::string &name)
+void Screen::setDesktopName(long i, const otk::ustring &name)
{
assert(i >= 0);