Implement callbacks as part of struct fields. Fixes #557383

gir: embed <callback> inside <field>
typelib: if a field contains a callback, store it just after the FieldBlob
girepository API: no additions

1 files changed, 16 insertions, 2 deletions

diff --git a/tools/generate.c b/tools/generate.c
index a71f3654..fcff5b62 100644
--- a/tools/generate.c
+++ b/tools/generate.c
@@ -340,6 +340,11 @@ write_constant_value (const gchar *namespace,
 		      Xml *file);
 
 static void
+write_callback_info (const gchar    *namespace,
+		     GICallbackInfo *info,
+		     Xml            *file);
+
+static void
 write_field_info (const gchar *namespace,
 		  GIFieldInfo *info,
 		  GIConstantInfo *branch,
@@ -350,6 +355,7 @@ write_field_info (const gchar *namespace,
   gint size;
   gint offset;
   GITypeInfo *type;
+  GIBaseInfo *interface;
   GArgument value; 
 
   name = g_base_info_get_name ((GIBaseInfo *)info);
@@ -389,8 +395,16 @@ write_field_info (const gchar *namespace,
       if (offset >= 0)
         xml_printf (file, "offset=\"%d\"", offset);
     }
-  
-  write_type_info (namespace, type, file);
+
+  interface = g_type_info_get_interface (type);
+  if (interface && g_base_info_get_type(interface) == GI_INFO_TYPE_CALLBACK)
+    write_callback_info (namespace, (GICallbackInfo *)interface, file);
+  else
+    write_type_info (namespace, type, file);
+
+  if (interface)
+    g_base_info_unref (interface);
+
   g_base_info_unref ((GIBaseInfo *)type);
 
   xml_end_element (file, "field");