Merge branch 'backport' into work

Conflicts:
	openbox/client.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 1e324b92..185bf537 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -64,6 +64,7 @@ void obt_prop_startup(void)
     CREATE(WM_CLIENT_LEADER);
     CREATE(WM_TRANSIENT_FOR);
     CREATE_(MOTIF_WM_HINTS);
+    CREATE_(MOTIF_WM_INFO);
 
     CREATE(SM_CLIENT_ID);
 
diff --git a/obt/prop.h b/obt/prop.h
index 22a1ab42..ae22b6fd 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -53,6 +53,7 @@ typedef enum {
     OBT_PROP_WM_CLIENT_LEADER,
     OBT_PROP_WM_TRANSIENT_FOR,
     OBT_PROP_MOTIF_WM_HINTS,
+    OBT_PROP_MOTIF_WM_INFO,
 
     /* SM atoms */
     OBT_PROP_SM_CLIENT_ID,