some small cleanups

[chaz/openbox] / otk / property.cc

diff --git a/otk/property.cc b/otk/property.cc
index 5425f8df81e3e604056c310ed45be4b64d6d9d73..9a0efe5bf6bd00f6e8a04e141713ede1cdf42bc3 100644 (file)
--- a/otk/property.cc
+++ b/otk/property.cc
@@ -4,12 +4,14 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+#include "property.hh"
+#include "display.hh"
+
 extern "C" {
 #include <assert.h>
 }
 
-#include "property.hh"
-#include "display.hh"
+#include <algorithm>
 
 namespace otk {
 
@@ -27,9 +29,7 @@ OBProperty::OBProperty()
   _atoms[Atom_String] = XA_STRING;
   _atoms[Atom_Utf8] = create("UTF8_STRING");
   
-#ifdef    HAVE_GETPID
-  _atoms[blackbox_pid] = create("_BLACKBOX_PID");
-#endif // HAVE_GETPID
+  _atoms[openbox_pid] = create("_OPENBOX_PID");
 
   _atoms[wm_colormap_windows] = create("WM_COLORMAP_WINDOWS");
   _atoms[wm_protocols] = create("WM_PROTOCOLS");
@@ -137,6 +137,7 @@ OBProperty::OBProperty()
   _atoms[net_wm_state_skip_pager] = create("_NET_WM_STATE_SKIP_PAGER");
   _atoms[net_wm_state_hidden] = create("_NET_WM_STATE_HIDDEN");
   _atoms[net_wm_state_fullscreen] = create("_NET_WM_STATE_FULLSCREEN");
+  _atoms[net_wm_state_floating] = create("_NET_WM_STATE_FLOATING");
   
   _atoms[kde_net_system_tray_windows] = create("_KDE_NET_SYSTEM_TRAY_WINDOWS");
   _atoms[kde_net_wm_system_tray_window_for] =
@@ -159,7 +160,9 @@ OBProperty::~OBProperty()
  */
 Atom OBProperty::create(const char *name) const
 {
-  return XInternAtom(OBDisplay::display, name, False);
+  Atom a = XInternAtom(OBDisplay::display, name, False);
+  assert(a);
+  return a;
 }