Merge branch 'master' into chaz

[chaz/openbox] / obt / ddparse.h

diff --git a/obt/ddparse.h b/obt/ddparse.h
index d33fe72a48e38efd051e28eac62dc06eb6d0d23f..d261f5bb0c444d253fbf89850564be9401fb53f7 100644 (file)
--- a/obt/ddparse.h
+++ b/obt/ddparse.h
@@ -21,13 +21,14 @@
 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_APPLICATION,
+    OBT_DDPARSE_ENUM_TYPE,
     OBT_DDPARSE_ENVIRONMENTS,
     OBT_DDPARSE_NUM_VALUE_TYPES
 } ObtDDParseValueType;
@@ -37,7 +38,7 @@ typedef struct _ObtDDParseValue {
     union _ObtDDParseValueValue {
         gchar *string;
         struct _ObtDDParseValueStrings {
-            gchar *s;
+            gchar **a;
             gulong n;
         } strings;
         gboolean boolean;