gtk+-2.0: Fix GtkBuildable custom methods

Fixes bug 593489, based on patch by Nicolas Bruguier.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 9af0470a69438d496cc37c4e3938343461defb4f..2092b6b85e382b9adf63fa26f3fb700584e4af9a 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -5476,11 +5476,11 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public interface Buildable {
-               public abstract void add_child (Gtk.Builder builder, GLib.Object child, string type);
+               public abstract void add_child (Gtk.Builder builder, GLib.Object child, string? type);
                public abstract unowned GLib.Object construct_child (Gtk.Builder builder, string name);
-               public abstract void custom_finished (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
-               public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
-               public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object child, string tagname, GLib.MarkupParser parser, void* data);
+               public abstract void custom_finished (Gtk.Builder builder, GLib.Object? child, string tagname, void* data);
+               public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object? child, string tagname, out void* data);
+               public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object? child, string tagname, out GLib.MarkupParser parser, out void* data);
                public abstract unowned GLib.Object get_internal_child (Gtk.Builder builder, string childname);
                public abstract unowned string get_name ();
                public abstract void parser_finished (Gtk.Builder builder);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 53c5bb81e1cea59e45e4561768dc117e573e221b..7e6afb8fd9fc95527e51546e507abf7ae6fb698c 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -48,6 +48,13 @@ gtk_box_query_child_packing.expand is_out="1"
 gtk_box_query_child_packing.fill is_out="1"
 gtk_box_query_child_packing.padding is_out="1"
 gtk_box_query_child_packing.pack_type is_out="1"
+gtk_buildable_add_child.type nullable="1"
+gtk_buildable_custom_finished.child nullable="1"
+gtk_buildable_custom_tag_end.child nullable="1"
+gtk_buildable_custom_tag_end.data is_out="1"
+gtk_buildable_custom_tag_start.child nullable="1"
+gtk_buildable_custom_tag_start.parser is_out="1"
+gtk_buildable_custom_tag_start.data is_out="1"
 gtk_builder_add_objects_from_file.object_ids no_array_length="1" is_array="1"
 gtk_builder_add_objects_from_string.object_ids no_array_length="1" is_array="1"
 GtkBuilderError errordomain="1"