gtk+-2.0: Fix gtk_builder_* and gtk_tree_view_* bindings

Fixes bug 583004.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index c8f0d281d6b4dc0a3ee6fab3ff251ba17a5c0b8c..1d83edd4e057d9d6978a972a88b582bf53381b8d 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -429,8 +429,8 @@ namespace Gtk {
        public class Builder : GLib.Object {
                public uint add_from_file (string filename) throws GLib.Error;
                public uint add_from_string (string buffer, size_t length) throws GLib.Error;
-               public uint add_objects_from_file (string filename, string object_ids) throws GLib.Error;
-               public uint add_objects_from_string (string buffer, size_t length, string object_ids) throws GLib.Error;
+               public uint add_objects_from_file (string filename, [CCode (array_length = false)] string[] object_ids) throws GLib.Error;
+               public uint add_objects_from_string (string buffer, size_t length, [CCode (array_length = false)] string[] object_ids) throws GLib.Error;
                public void connect_signals (void* user_data);
                public void connect_signals_full (Gtk.BuilderConnectFunc func);
                public static GLib.Quark error_quark ();
@@ -4673,12 +4673,12 @@ namespace Gtk {
                public void collapse_all ();
                public bool collapse_row (Gtk.TreePath path);
                public void columns_autosize ();
-               public void convert_bin_window_to_tree_coords (int bx, int by, int tx, int ty);
-               public void convert_bin_window_to_widget_coords (int bx, int by, int wx, int wy);
-               public void convert_tree_to_bin_window_coords (int tx, int ty, int bx, int by);
-               public void convert_tree_to_widget_coords (int tx, int ty, int wx, int wy);
-               public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
-               public void convert_widget_to_tree_coords (int wx, int wy, int tx, int ty);
+               public void convert_bin_window_to_tree_coords (int bx, int by, out int tx, out int ty);
+               public void convert_bin_window_to_widget_coords (int bx, int by, out int wx, out int wy);
+               public void convert_tree_to_bin_window_coords (int tx, int ty, out int bx, out int by);
+               public void convert_tree_to_widget_coords (int tx, int ty, out int wx, out int wy);
+               public void convert_widget_to_bin_window_coords (int wx, int wy, out int bx, out int by);
+               public void convert_widget_to_tree_coords (int wx, int wy, out int tx, out int ty);
                public unowned Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
                public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
                public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index eaa8b5243e4fc8aecb0bb8ebc0ef3f690d72f480..9931b8789792b3fde44b3cad17243234ee8f2c3b 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,8 @@ 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_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"
 GtkButton::clicked has_emitter="1"
 GtkButton::enter has_emitter="1"
@@ -508,6 +510,18 @@ gtk_tree_view_column_cell_get_size.height is_out="1"
 gtk_tree_view_column_set_cell_data_func.func transfer_ownership="1"
 gtk_tree_view_column_set_cell_data_func.func_data hidden="1"
 gtk_tree_view_column_set_cell_data_func.destroy hidden="1"
+gtk_tree_view_convert_bin_window_to_tree_coords.tx is_out="1"
+gtk_tree_view_convert_bin_window_to_tree_coords.ty is_out="1"
+gtk_tree_view_convert_bin_window_to_widget_coords.wx is_out="1"
+gtk_tree_view_convert_bin_window_to_widget_coords.wy is_out="1"
+gtk_tree_view_convert_tree_to_bin_window_coords.bx is_out="1"
+gtk_tree_view_convert_tree_to_bin_window_coords.by is_out="1"
+gtk_tree_view_convert_tree_to_widget_coords.wx is_out="1"
+gtk_tree_view_convert_tree_to_widget_coords.wy is_out="1"
+gtk_tree_view_convert_widget_to_bin_window_coords.bx is_out="1"
+gtk_tree_view_convert_widget_to_bin_window_coords.by is_out="1"
+gtk_tree_view_convert_widget_to_tree_coords.tx is_out="1"
+gtk_tree_view_convert_widget_to_tree_coords.ty is_out="1"
 gtk_tree_view_get_background_area.rect is_out="1"
 gtk_tree_view_get_cell_area.rect is_out="1"
 gtk_tree_view_get_cursor.path value_owned="1" nullable="1"