Merge branch 'backport' into work

Conflicts:
	openbox/config.c
	openbox/event.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	openbox/screen.h

1 files changed, 3 insertions, 0 deletions

diff --git a/obt/prop.c b/obt/prop.c
index 185bf537..f4c8db17 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -190,6 +190,9 @@ 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);
 }
 
 Atom obt_prop_atom(ObtPropAtom a)