From 6756ea97eb06dadb6b1328d0f6019290deb3416e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 Mar 2013 23:25:19 +0000 Subject: [PATCH] gtk+-2.0, gtk+-3.0: Fix TreePath.to_string and TreeView.get_visible_range Based on patch by shuerhaaken. Fixes bug 695812. --- vapi/gtk+-2.0.vapi | 4 ++-- vapi/gtk+-3.0.vapi | 4 ++-- vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 3 +++ vapi/packages/gtk+-3.0/gtk+-3.0.metadata | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index dd3d2b9b9..2c4da87f7 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -5050,7 +5050,7 @@ namespace Gtk { public void next (); public void prepend_index (int index_); public bool prev (); - public unowned string to_string (); + public string to_string (); public bool up (); } [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "gtk_tree_row_reference_get_type ()")] @@ -5197,7 +5197,7 @@ namespace Gtk { public int get_tooltip_column (); public bool get_tooltip_context (ref int x, ref int y, bool keyboard_tip, out unowned Gtk.TreeModel model, out unowned Gtk.TreePath path, out Gtk.TreeIter iter); public unowned Gtk.Adjustment get_vadjustment (); - public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path); + public bool get_visible_range (out Gtk.TreePath start_path, out Gtk.TreePath end_path); public void get_visible_rect (out Gdk.Rectangle visible_rect); public int insert_column (Gtk.TreeViewColumn column, int position); public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 2db48cf8e..7b10f2684 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -5415,7 +5415,7 @@ namespace Gtk { public void next (); public void prepend_index (int index_); public bool prev (); - public unowned string to_string (); + public string to_string (); public bool up (); } [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "gtk_tree_row_reference_get_type ()")] @@ -5547,7 +5547,7 @@ namespace Gtk { public int get_tooltip_column (); public bool get_tooltip_context (ref int x, ref int y, bool keyboard_tip, out unowned Gtk.TreeModel model, out unowned Gtk.TreePath path, out Gtk.TreeIter iter); public unowned Gtk.Adjustment get_vadjustment (); - public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path); + public bool get_visible_range (out Gtk.TreePath start_path, out Gtk.TreePath end_path); public void get_visible_rect (out Gdk.Rectangle visible_rect); public int insert_column (Gtk.TreeViewColumn column, int position); public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 548677b0b..40c4f7fca 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -247,6 +247,8 @@ gtk_icon_view_get_tooltip_context.iter is_out="1" gtk_icon_view_get_tooltip_context.x is_out="1" gtk_icon_view_get_tooltip_context.y is_out="1" gtk_icon_view_get_selected_items transfer_ownership="1" type_arguments="TreePath" +gtk_tree_view_get_visible_range.start_path is_out="1" transfer_ownership="1" +gtk_tree_view_get_visible_range.end_path is_out="1" transfer_ownership="1" gtk_icon_set_copy transfer_ownership="1" gtk_icon_source_copy transfer_ownership="1" gtk_icon_theme_list_contexts transfer_ownership="1" type_arguments="string" @@ -743,6 +745,7 @@ gtk_tree_model_sort_convert_iter_to_child_iter.child_iter is_out="1" gtk_tree_path_get_indices is_array="1" no_array_length="1" gtk_tree_path_new_from_indices sentinel="-1" gtk_tree_path_copy transfer_ownership="1" +gtk_tree_path_to_string transfer_ownership="1" # GtkTreePath should be an opaque value type as it is not immutable # but should have copy-on-assignment semantics GtkTreePath is_value_type="0" is_immutable="1" const_cname="GtkTreePath" diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 2f78fd5d8..6bbc7f8cb 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -932,6 +932,7 @@ gtk_tree_path_get_indices_with_depth is_array="1" name="get_indices" gtk_tree_path_get_indices_with_depth.depth hidden="1" gtk_tree_path_new_from_indices sentinel="-1" gtk_tree_path_copy transfer_ownership="1" +gtk_tree_path_to_string transfer_ownership="1" # GtkTreePath should be an opaque value type as it is not immutable # but should have copy-on-assignment semantics GtkTreePath is_value_type="0" is_immutable="1" const_cname="GtkTreePath" @@ -1021,6 +1022,8 @@ gtk_tree_view_get_drag_dest_row.pos is_out="1" value_owned="1" gtk_tree_view_get_tooltip_context.iter is_out="1" gtk_tree_view_get_tooltip_context.x is_ref="1" gtk_tree_view_get_tooltip_context.y is_ref="1" +gtk_tree_view_get_visible_range.start_path is_out="1" transfer_ownership="1" +gtk_tree_view_get_visible_range.end_path is_out="1" transfer_ownership="1" gtk_tree_view_get_visible_rect.visible_rect is_out="1" gtk_tree_view_insert_column_with_attributes ellipsis="1" gtk_tree_view_insert_column_with_attributes.title nullable="1" -- 2.47.2