From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 8 Mar 2008 16:29:40 +0000 (+0100)
Subject: Merge branch 'mikabox/personal' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~55
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a1ebaf42a5124954e0a33133b2fb5f44113258ce;p=mikachu%2Fopenbox.git

Merge branch 'mikabox/personal' into wip/mikabox

Conflicts:

	obt/prop.c
---

a1ebaf42a5124954e0a33133b2fb5f44113258ce
diff --cc obt/prop.c
index 205ce6cd,ca5c19d4..17e8b9a3
--- a/obt/prop.c
+++ b/obt/prop.c
@@@ -188,9 -189,8 +189,10 @@@ void obt_prop_startup(void
      CREATE_(OB_CONFIG_FILE);
      CREATE_(OB_WM_ACTION_UNDECORATE);
      CREATE_(OB_WM_STATE_UNDECORATED);
 +    CREATE_(OB_WM_STATE_LOCKED);
+     CREATE_(OB_LAST_DESKTOP);
      CREATE_(OB_CONTROL);
 +    CREATE_(OB_TARGET_WINDOW);
  }
  
  Atom obt_prop_atom(ObtPropAtom a)
diff --cc obt/prop.h
index 72226ec3,1107ac8b..80e28be9
--- a/obt/prop.h
+++ b/obt/prop.h
@@@ -204,14 -204,14 +204,16 @@@ typedef enum 
  
      /* Openbox specific atoms */
  
+     OBT_PROP_OB_FOCUS,
      OBT_PROP_OB_WM_ACTION_UNDECORATE,
      OBT_PROP_OB_WM_STATE_UNDECORATED,
 +    OBT_PROP_OB_WM_STATE_LOCKED,
      OBT_PROP_OPENBOX_PID, /* this is depreecated in favour of ob_control */
      OBT_PROP_OB_THEME,
      OBT_PROP_OB_CONFIG_FILE,
+     OBT_PROP_OB_LAST_DESKTOP,
      OBT_PROP_OB_CONTROL,
 +    OBT_PROP_OB_TARGET_WINDOW,
  
      OBT_PROP_NUM_ATOMS
  } ObtPropAtom;