From: Luca Bruno Date: Sat, 17 May 2014 20:31:03 +0000 (+0200) Subject: Revert "girparser: Make array element type owned by default" X-Git-Tag: 0.25.1~88 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d755a23195bd2a0ee7047fc61850ef9714edf8cc;p=thirdparty%2Fvala.git Revert "girparser: Make array element type owned by default" This reverts commit 1c814e174d161102ea3288121f6b4c09c8b46482. --- diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala index f48a7b74e..025384c0a 100644 --- a/vala/valagirparser.vala +++ b/vala/valagirparser.vala @@ -2371,7 +2371,6 @@ public class Vala.GirParser : CodeVisitor { } next (); var element_type = parse_type (); - element_type.value_owned = true; end_element ("array"); return new ArrayType (element_type, 1, src); } diff --git a/vapi/atk.vapi b/vapi/atk.vapi index a346a1f0b..f5d9c99b9 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -1,4 +1,4 @@ -/* atk.vapi generated by lt-vapigen, do not modify. */ +/* atk.vapi generated by vapigen, do not modify. */ [CCode (cprefix = "Atk", gir_namespace = "Atk", gir_version = "1.0", lower_case_cprefix = "atk_")] namespace Atk { @@ -237,7 +237,7 @@ namespace Atk { public bool contains_state (Atk.StateType type); public bool contains_states ([CCode (array_length_cname = "n_types", array_length_pos = 1.1)] Atk.StateType[] types); public bool is_empty (); - public Atk.StateSet or_sets (Atk.StateSet compare_set); + public Atk.StateSet? or_sets (Atk.StateSet compare_set); public bool remove_state (Atk.StateType type); public Atk.StateSet xor_sets (Atk.StateSet compare_set); } @@ -287,11 +287,11 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h", type_id = "atk_action_get_type ()")] public interface Action : GLib.Object { public abstract bool do_action (int i); - public abstract unowned string get_description (int i); - public abstract unowned string get_keybinding (int i); - public abstract unowned string get_localized_name (int i); + public abstract unowned string? get_description (int i); + public abstract unowned string? get_keybinding (int i); + public abstract unowned string? get_localized_name (int i); public abstract int get_n_actions (); - public abstract unowned string get_name (int i); + public abstract unowned string? get_name (int i); public abstract bool set_description (int i, string desc); } [CCode (cheader_filename = "atk/atk.h", type_id = "atk_component_get_type ()")] @@ -308,7 +308,7 @@ namespace Atk { [Deprecated] public abstract void get_size (int width, int height); public abstract bool grab_focus (); - public abstract Atk.Object ref_accessible_at_point (int x, int y, Atk.CoordType coord_type); + public abstract Atk.Object? ref_accessible_at_point (int x, int y, Atk.CoordType coord_type); [Deprecated] public abstract void remove_focus_handler (uint handler_id); public abstract bool set_extents (int x, int y, int width, int height, Atk.CoordType coord_type); @@ -319,7 +319,7 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h", type_id = "atk_document_get_type ()")] public interface Document : GLib.Object { [CCode (vfunc_name = "get_document_attribute_value")] - public virtual unowned string get_attribute_value (string attribute_name); + public virtual unowned string? get_attribute_value (string attribute_name); [CCode (vfunc_name = "get_document_attributes")] public virtual unowned Atk.AttributeSet get_attributes (); public virtual int get_current_page_number (); @@ -364,7 +364,7 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h", type_id = "atk_image_get_type ()")] public interface Image : GLib.Object { public abstract unowned string get_image_description (); - public abstract unowned string get_image_locale (); + public abstract unowned string? get_image_locale (); public abstract void get_image_position (int x, int y, Atk.CoordType coord_type); public abstract void get_image_size (int width, int height); public abstract bool set_image_description (string description); @@ -379,7 +379,7 @@ namespace Atk { public abstract bool clear_selection (); public abstract int get_selection_count (); public abstract bool is_child_selected (int i); - public abstract Atk.Object ref_selection (int i); + public abstract Atk.Object? ref_selection (int i); public abstract bool remove_selection (int i); public abstract bool select_all_selection (); public virtual signal void selection_changed (); @@ -389,27 +389,27 @@ namespace Atk { public abstract unowned string get_mime_type (int i); public abstract int get_n_mime_types (); public abstract GLib.IOChannel get_stream (string mime_type); - public abstract unowned string get_uri (string mime_type); + public abstract unowned string? get_uri (string mime_type); } [CCode (cheader_filename = "atk/atk.h", type_id = "atk_table_get_type ()")] public interface Table : GLib.Object { public abstract bool add_column_selection (int column); public abstract bool add_row_selection (int row); - public abstract unowned Atk.Object get_caption (); + public abstract unowned Atk.Object? get_caption (); [Deprecated] public abstract int get_column_at_index (int index_); public abstract unowned string get_column_description (int column); public abstract int get_column_extent_at (int row, int column); - public abstract unowned Atk.Object get_column_header (int column); + public abstract unowned Atk.Object? get_column_header (int column); [Deprecated] public abstract int get_index_at (int row, int column); public abstract int get_n_columns (); public abstract int get_n_rows (); [Deprecated] public abstract int get_row_at_index (int index_); - public abstract unowned string get_row_description (int row); + public abstract unowned string? get_row_description (int row); public abstract int get_row_extent_at (int row, int column); - public abstract unowned Atk.Object get_row_header (int row); + public abstract unowned Atk.Object? get_row_header (int row); public abstract int get_selected_columns (int selected); public abstract int get_selected_rows (int selected); public abstract Atk.Object get_summary (); @@ -468,7 +468,7 @@ namespace Atk { public abstract void get_range_extents (int start_offset, int end_offset, Atk.CoordType coord_type, Atk.TextRectangle rect); public abstract Atk.AttributeSet get_run_attributes (int offset, out int start_offset, out int end_offset); public abstract string get_selection (int selection_num, out int start_offset, out int end_offset); - public abstract string get_string_at_offset (int offset, Atk.TextGranularity granularity, out int start_offset, out int end_offset); + public abstract string? get_string_at_offset (int offset, Atk.TextGranularity granularity, out int start_offset, out int end_offset); public abstract string get_text (int start_offset, int end_offset); [Deprecated] public abstract string get_text_after_offset (int offset, Atk.TextBoundary boundary_type, out int start_offset, out int end_offset); @@ -498,7 +498,7 @@ namespace Atk { public abstract void get_minimum_increment (GLib.Value value); [Deprecated] public abstract void get_minimum_value (GLib.Value value); - public abstract Atk.Range get_range (); + public abstract Atk.Range? get_range (); public abstract GLib.SList get_sub_ranges (); public abstract void get_value_and_text (out double value, out string text); [Deprecated] @@ -838,7 +838,7 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h")] public static unowned string get_name (Atk.TextAttribute attr); [CCode (cheader_filename = "atk/atk.h")] - public static unowned string get_value (Atk.TextAttribute attr, int index_); + public static unowned string? get_value (Atk.TextAttribute attr, int index_); [CCode (cheader_filename = "atk/atk.h")] public static Atk.TextAttribute register (string name); } @@ -916,6 +916,8 @@ namespace Atk { public const int MICRO_VERSION; [CCode (cheader_filename = "atk/atk.h", cname = "ATK_MINOR_VERSION")] public const int MINOR_VERSION; + [CCode (cheader_filename = "atk/atk.h", cname = "ATK_VERSION_MIN_REQUIRED")] + public const int VERSION_MIN_REQUIRED; [CCode (cheader_filename = "atk/atk.h")] [Deprecated (replacement = "Atk.Util.add_focus_tracker", since = "vala-0.16")] public static uint add_focus_tracker (Atk.EventListener focus_tracker);