Merge branch 'backport' into work

[chaz/openbox] / obt / prop.h

diff --git a/obt/prop.h b/obt/prop.h
index e1236116403faaedcb1abb53771f980bd7983dbf..ae22b6fd65258a880af715f1cb08fee4cbf986c3 100644 (file)
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -51,7 +51,9 @@ 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,
+    OBT_PROP_MOTIF_WM_INFO,
 
     /* SM atoms */
     OBT_PROP_SM_CLIENT_ID,
@@ -84,6 +86,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,