X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fxatom.cc;h=3ed6cdf4957bdf875265eff36202179a66044b3f;hb=373de009f7e98b0c6f3a78f31c1e5c120cd722ed;hp=5561503adf8d97cc0992a1daad7cbcc112872b8c;hpb=86bef745b9e974f664752c6cc56f7e6ec5642efc;p=chaz%2Fopenbox

diff --git a/src/xatom.cc b/src/xatom.cc
index 5561503a..3ed6cdf4 100644
--- a/src/xatom.cc
+++ b/src/xatom.cc
@@ -1,7 +1,5 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#include "../config.h"
-
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
@@ -14,6 +12,8 @@ extern "C" {
 #include "screen.hh"
 #include "util.hh"
 
+namespace ob {
+
 XAtom::XAtom(Display *d) {
   _display = d;
 
@@ -170,7 +170,7 @@ Atom XAtom::create(const char *name) const {
 /*
  * Sets which atoms are supported for NETWM, by Openbox, on the root window.
  */
-void XAtom::setSupported(const ScreenInfo *screen) {
+void XAtom::setSupported(const otk::ScreenInfo *screen) {
   Window root = screen->getRootWindow();
 
   // create the netwm support window
@@ -511,3 +511,5 @@ void XAtom::sendClientMessage(Window target, Atoms type, Window about,
              SubstructureRedirectMask | SubstructureNotifyMask,
              &e);
 }
+
+}