X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fxatom.cc;h=3ed6cdf4957bdf875265eff36202179a66044b3f;hb=d0b55be2c7afb5b25b42804c9eab4995e64dff52;hp=59e8b164e9c43c4dc47423bca08e9007ff7882e3;hpb=db451d95bf97b8a8e995f031ac98da50606fd3a0;p=chaz%2Fopenbox

diff --git a/src/xatom.cc b/src/xatom.cc
index 59e8b164..3ed6cdf4 100644
--- a/src/xatom.cc
+++ b/src/xatom.cc
@@ -1,32 +1,19 @@
-// XAtom.cc for Openbox
-// Copyright (c) 2002 - 2002 Ben Jansens (xor at orodu.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-#include "../config.h"
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
+#ifdef    HAVE_CONFIG_H
+#  include "../config.h"
+#endif // HAVE_CONFIG_H
+
+extern "C" {
 #include <assert.h>
+}
 
 #include "xatom.hh"
 #include "screen.hh"
 #include "util.hh"
 
+namespace ob {
+
 XAtom::XAtom(Display *d) {
   _display = d;
 
@@ -183,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
@@ -524,3 +511,5 @@ void XAtom::sendClientMessage(Window target, Atoms type, Window about,
              SubstructureRedirectMask | SubstructureNotifyMask,
              &e);
 }
+
+}