X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fproperty.hh;h=9e2d7aca7c139e53757ed5d3b79a4de825166a4f;hb=5a139f7263e33b499836f5df9ac37400e02c32f9;hp=215f941f47b8d7021713e3f6003869a1665658f0;hpb=c9f36d34a414123cec8ebc35c87b8b9d5673b155;p=chaz%2Fopenbox

diff --git a/otk/property.hh b/otk/property.hh
index 215f941f..9e2d7aca 100644
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -33,9 +33,7 @@ public:
     Atom_String,   //!< The atom which represents ascii strings
     Atom_Utf8,     //!< The atom which represents utf8-encoded strings
     
-#ifdef    HAVE_GETPID
-    blackbox_pid,
-#endif // HAVE_GETPID
+    openbox_pid,
 
     // window hints
     wm_colormap_windows,
@@ -136,6 +134,7 @@ public:
     net_wm_state_skip_pager,
     net_wm_state_hidden,
     net_wm_state_fullscreen,
+    net_wm_state_floating,
 
     kde_net_system_tray_windows,
     kde_net_wm_system_tray_window_for,
@@ -159,7 +158,7 @@ public:
 private:
   //! The value of all atoms on the X server that exist in the
   //! OBProperty::Atoms enum
-  Atom                  _atoms[NUM_ATOMS];
+  Atom _atoms[NUM_ATOMS];
 
   //! Gets the value of an Atom from the X server, creating it if nessesary
   Atom create(const char *name) const;
@@ -317,7 +316,7 @@ public:
              value to return
     @return The value of the specified Atom
   */
-  inline Atom atom(Atoms a) {
+  inline Atom atom(Atoms a) const {
     assert(a >= 0 && a < NUM_ATOMS); Atom ret = _atoms[a]; assert(ret != 0);
     return ret;
   }