Merge branch 'm4/master'

[chaz/openbox] / obt / ddparse.h

diff --git a/obt/ddparse.h b/obt/ddparse.h
index b4e0bf412c4a0f0f1bdd3d13f365c26678daad35..d261f5bb0c444d253fbf89850564be9401fb53f7 100644 (file)
--- a/obt/ddparse.h
+++ b/obt/ddparse.h
@@ -21,12 +21,15 @@
 typedef struct _ObtDDParseGroup ObtDDParseGroup;
 
 typedef enum {
+    OBT_DDPARSE_EXEC,
     OBT_DDPARSE_STRING,
     OBT_DDPARSE_LOCALESTRING,
     OBT_DDPARSE_STRINGS,
     OBT_DDPARSE_LOCALESTRINGS,
     OBT_DDPARSE_BOOLEAN,
     OBT_DDPARSE_NUMERIC,
+    OBT_DDPARSE_ENUM_TYPE,
+    OBT_DDPARSE_ENVIRONMENTS,
     OBT_DDPARSE_NUM_VALUE_TYPES
 } ObtDDParseValueType;
 
@@ -35,11 +38,13 @@ typedef struct _ObtDDParseValue {
     union _ObtDDParseValueValue {
         gchar *string;
         struct _ObtDDParseValueStrings {
-            gchar *s;
+            gchar **a;
             gulong n;
         } strings;
         gboolean boolean;
         gfloat numeric;
+        guint enumerable;
+        guint environments; /*!< A mask of flags from ObtLinkEnvMask */
     } value;
 } ObtDDParseValue;