gtk+-2.0: Fix gtk_container_forall and signal bindings

Fixes part of bug 555566.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 83f5711454b67a2590d6d675d63d66f783bebab9..b77f7d9dadc7d5cca5601634346bf13504aeb1b8 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -1061,7 +1061,7 @@ namespace Gtk {
                public static unowned GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
                [NoWrapper]
                public virtual unowned string composite_name (Gtk.Widget child);
-               public virtual void forall (Gtk.Callback callback, void* callback_data);
+               public virtual void forall (Gtk.Callback callback);
                [CCode (vfunc_name = "forall")]
                public virtual void forall_internal (bool include_internal, Gtk.Callback callback);
                public void @foreach (Gtk.Callback callback);
@@ -5214,7 +5214,7 @@ namespace Gtk {
                public virtual signal void grab_notify (bool was_grabbed);
                [HasEmitter]
                public virtual signal void hide ();
-               public virtual signal void hierarchy_changed (Gtk.Widget previous_toplevel);
+               public virtual signal void hierarchy_changed (Gtk.Widget? previous_toplevel);
                public virtual signal bool key_press_event (Gdk.EventKey event);
                public virtual signal bool key_release_event (Gdk.EventKey event);
                [HasEmitter]
@@ -5228,7 +5228,7 @@ namespace Gtk {
                public virtual signal bool motion_notify_event (Gdk.EventMotion event);
                public virtual signal void move_focus (Gtk.DirectionType p0);
                public virtual signal bool no_expose_event (Gdk.EventNoExpose event);
-               public virtual signal void parent_set (Gtk.Widget previous_parent);
+               public virtual signal void parent_set (Gtk.Widget? previous_parent);
                public virtual signal bool popup_menu ();
                public virtual signal bool property_notify_event (Gdk.EventProperty event);
                public virtual signal bool proximity_in_event (Gdk.EventProximity event);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index ddf7b713ba65a180be9b15a85ccbad2800f8b6db..4f8ee92b1185be7854118234b3f0daf305144c77 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -100,6 +100,7 @@ GtkContainer::add has_emitter="1"
 GtkContainer::check_resize has_emitter="1"
 GtkContainer::remove has_emitter="1"
 GtkContainer::set_focus_child has_emitter="1"
+gtk_container_forall.callback_data hidden="1"
 gtk_container_foreach.callback_data hidden="1"
 gtk_container_get_children hidden="1"
 GtkContainerClass name="pointer"
@@ -647,8 +648,10 @@ GtkWidget::expose_event.event namespace_name="Gdk" type_name="EventExpose"
 GtkWidget::no_expose_event.event namespace_name="Gdk" type_name="EventNoExpose"
 GtkWidget::focus_in_event.event namespace_name="Gdk" type_name="EventFocus"
 GtkWidget::focus_out_event.event namespace_name="Gdk" type_name="EventFocus"
+GtkWidget::hierarchy_changed.previous_toplevel nullable="1"
 GtkWidget::motion_notify_event.event namespace_name="Gdk" type_name="EventMotion"
 GtkWidget::focus_out_event.event namespace_name="Gdk" type_name="EventFocus"
+GtkWidget::parent_set.previous_parent nullable="1"
 GtkWidget::property_notify_event.event namespace_name="Gdk" type_name="EventProperty"
 GtkWidget::proximity_in_event.event namespace_name="Gdk" type_name="EventProximity"
 GtkWidget::proximity_out_event.event namespace_name="Gdk" type_name="EventProximity"