tools/manager-file.py: add support for CMs that don't use the offset field in the TpCMParamSpec struct

1 files changed, 7 insertions, 3 deletions

diff --git a/tools/manager-file.py b/tools/manager-file.py
index eb15cdb8..45f64040 100644
--- a/tools/manager-file.py
+++ b/tools/manager-file.py
@@ -141,16 +141,20 @@ def write_c_params(f, manager, proto, struct, params):
         else:
             flags = '0'
 
+        if struct is None or struct_field is None:
+            struct_offset = '0'
+        else:
+            struct_offset = 'G_STRUCT_OFFSET (%s, %s)' % (struct, struct_field)
+
         print >> f, ('''  { %s, %s, %s,
     %s,
     %s, /* default */
-    G_STRUCT_OFFSET (%s, %s),
+    %s, /* struct offset */
     %s, /* filter */
     %s, /* filter data */
     %s /* setter data */ },''' %
                 (c_string(param), c_string(dtype), gtypes[dtype], flags,
-                    default, struct, struct_field, filter, filter_data,
-                    setter_data))
+                    default, struct_offset, filter, filter_data, setter_data))
 
     print >> f, "  { NULL }"
     print >> f, "};"