Merge branch 'backport' into work

Conflicts:

	openbox/frame.c
	openbox/menuframe.c

1 files changed, 1 insertions, 0 deletions

diff --git a/obt/prop.c b/obt/prop.c
index 89d3950d..5fe0f730 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -123,6 +123,7 @@ void obt_prop_startup()
     CREATE_(NET_WM_WINDOW_TYPE_SPLASH);
     CREATE_(NET_WM_WINDOW_TYPE_DIALOG);
     CREATE_(NET_WM_WINDOW_TYPE_NORMAL);
+    CREATE_(NET_WM_WINDOW_TYPE_POPUP_MENU);
 
     prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOPLEFT] = 0;
     prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOP] = 1;