Merge branch 'backport' into work

[chaz/openbox] / obt / prop.c

diff --git a/obt/prop.c b/obt/prop.c
index 89d3950dbf810bfca2639e5090f35e492eaa4939..108c118496782f86a4cc5a713c666cb669abd3d4 100644 (file)
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -33,7 +33,7 @@ gboolean prop_started = FALSE;
 #define CREATE(var) CREATE_NAME(var, #var)
 #define CREATE_(var) CREATE_NAME(var, "_" #var)
 
-void obt_prop_startup()
+void obt_prop_startup(void)
 {
     if (prop_started) return;
     prop_started = TRUE;
@@ -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;