Merge branch 'backport' into work

Conflicts:

	openbox/menuframe.c
	openbox/prompt.c
	openbox/prop.c
	openbox/prop.h

2 files changed, 2 insertions, 0 deletions

diff --git a/obt/prop.c b/obt/prop.c
index 108c1184..1e324b92 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -62,6 +62,7 @@ void obt_prop_startup(void)
     CREATE(WM_CLIENT_MACHINE);
     CREATE(WM_COMMAND);
     CREATE(WM_CLIENT_LEADER);
+    CREATE(WM_TRANSIENT_FOR);
     CREATE_(MOTIF_WM_HINTS);
 
     CREATE(SM_CLIENT_ID);
diff --git a/obt/prop.h b/obt/prop.h
index 97a2c9f5..22a1ab42 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -51,6 +51,7 @@ typedef enum {
     OBT_PROP_WM_CLIENT_MACHINE,
     OBT_PROP_WM_COMMAND,
     OBT_PROP_WM_CLIENT_LEADER,
+    OBT_PROP_WM_TRANSIENT_FOR,
     OBT_PROP_MOTIF_WM_HINTS,
 
     /* SM atoms */