From 68194ce957db36ead19a39fdc7636a220befafe9 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 20 Dec 2002 15:38:49 +0000 Subject: update to cleaned up otk api --- src/rootwindow.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/rootwindow.cc') diff --git a/src/rootwindow.cc b/src/rootwindow.cc index 04b39d87..364f6144 100644 --- a/src/rootwindow.cc +++ b/src/rootwindow.cc @@ -17,7 +17,7 @@ OBRootWindow::OBRootWindow(int screen) { updateDesktopNames(); - Openbox::instance->registerHandler(_info->getRootWindow(), this); + Openbox::instance->registerHandler(_info->rootWindow(), this); } @@ -34,7 +34,7 @@ void OBRootWindow::updateDesktopNames() unsigned long num = (unsigned) -1; - if (!property->get(_info->getRootWindow(), + if (!property->get(_info->rootWindow(), otk::OBProperty::net_desktop_names, otk::OBProperty::utf8, &num, &_names)) _names.clear(); @@ -88,7 +88,7 @@ void OBRootWindow::setDesktopName(int i, const std::string &name) otk::OBProperty::StringVect newnames = _names; newnames[i] = name; - property->set(_info->getRootWindow(), otk::OBProperty::net_desktop_names, + property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names, otk::OBProperty::utf8, newnames); } @@ -104,8 +104,7 @@ void OBRootWindow::mapRequestHandler(const XMapRequestEvent &e) if (client) { // XXX: uniconify and/or unshade the window } else { - Openbox::instance->screen(_info->getScreenNumber())-> - manageWindow(e.window); + Openbox::instance->screen(_info->screen())->manageWindow(e.window); } } -- cgit v1.2.3