Merge branch 'backport' into work

Conflicts:

	configure.ac
	data/rc.xml
	openbox/client.c
	openbox/event.c
	openbox/focus_cycle.c
	openbox/focus_cycle_popup.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	version.h.in

2 files changed, 10 insertions, 6 deletions

diff --git a/obt/prop.c b/obt/prop.c
index f4c8db17..3af9c7d7 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -190,9 +190,11 @@ void obt_prop_startup(void)
     CREATE_(OB_WM_ACTION_UNDECORATE);
     CREATE_(OB_WM_STATE_UNDECORATED);
     CREATE_(OB_CONTROL);
-    CREATE_(OB_ROLE);
-    CREATE_(OB_NAME);
-    CREATE_(OB_CLASS);
+    CREATE_(OB_VERSION);
+    CREATE_(OB_APP_ROLE);
+    CREATE_(OB_APP_NAME);
+    CREATE_(OB_APP_CLASS);
+    CREATE_(OB_APP_TYPE);
 }
 
 Atom obt_prop_atom(ObtPropAtom a)
diff --git a/obt/prop.h b/obt/prop.h
index 52c1de1e..0a471cd5 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -211,9 +211,11 @@ typedef enum {
     OBT_PROP_OB_THEME,
     OBT_PROP_OB_CONFIG_FILE,
     OBT_PROP_OB_CONTROL,
-    OBT_PROP_OB_ROLE,
-    OBT_PROP_OB_NAME,
-    OBT_PROP_OB_CLASS,
+    OBT_PROP_OB_VERSION,
+    OBT_PROP_OB_APP_ROLE,
+    OBT_PROP_OB_APP_NAME,
+    OBT_PROP_OB_APP_CLASS,
+    OBT_PROP_OB_APP_TYPE,
 
     OBT_PROP_NUM_ATOMS
 } ObtPropAtom;