Merge branch 'backport' into work

[chaz/openbox] / obt / prop.h

diff --git a/obt/prop.h b/obt/prop.h
index 4de3111dbec5f9e3c4b17798298c0bcc30201825..97a2c9f57ed9a3a11858de78bd663292257b517c 100644 (file)
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -84,6 +84,8 @@ typedef enum {
     OBT_PROP_NET_WM_BOTTOMRIGHT,
     OBT_PROP_NET_WM_BOTTOMLEFT,
 
+    OBT_PROP_NET_WM_WINDOW_TYPE_POPUP_MENU,
+
     OBT_PROP_PRIVATE_PADDING1,
     OBT_PROP_PRIVATE_PADDING2,
     OBT_PROP_PRIVATE_PADDING3,
@@ -205,6 +207,7 @@ typedef enum {
     OBT_PROP_OB_WM_STATE_UNDECORATED,
     OBT_PROP_OPENBOX_PID, /* this is depreecated in favour of ob_control */
     OBT_PROP_OB_THEME,
+    OBT_PROP_OB_CONFIG_FILE,
     OBT_PROP_OB_CONTROL,
 
     OBT_PROP_NUM_ATOMS