From: Rico Tzschichholz Date: Fri, 7 Aug 2020 19:45:22 +0000 (+0200) Subject: goocanvas-2.0: Fix some field ownerships and types X-Git-Tag: 0.46.13~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12da8b467a21a72c71b55585a5b95317b1eae9d5;p=thirdparty%2Fvala.git goocanvas-2.0: Fix some field ownerships and types Fixes https://gitlab.gnome.org/GNOME/vala/issues/1057 --- diff --git a/vapi/goocanvas-2.0.vapi b/vapi/goocanvas-2.0.vapi index 6aaf4bd4d..cd7143c65 100644 --- a/vapi/goocanvas-2.0.vapi +++ b/vapi/goocanvas-2.0.vapi @@ -99,7 +99,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_ellipse_get_type ()")] public class CanvasEllipse : Goo.CanvasItemSimple, Goo.CanvasItem { - public Goo.CanvasEllipseData ellipse_data; + public Goo.CanvasEllipseData? ellipse_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasEllipse (Goo.CanvasItem? parent, double center_x, double center_y, double radius_x, double radius_y, ...); [NoAccessorMethod] @@ -143,7 +143,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_grid_get_type ()")] public class CanvasGrid : Goo.CanvasItemSimple, Goo.CanvasItem { - public Goo.CanvasGridData grid_data; + public Goo.CanvasGridData? grid_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasGrid (Goo.CanvasItem? parent, double x, double y, double width, double height, double x_step, double y_step, double x_offset, double y_offset, ...); [NoAccessorMethod] @@ -302,7 +302,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_image_get_type ()")] public class CanvasImage : Goo.CanvasItemSimple, Goo.CanvasItem { - public Goo.CanvasImageData image_data; + public Goo.CanvasImageData? image_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasImage (Goo.CanvasItem? parent, Gdk.Pixbuf? pixbuf, double x, double y, ...); [NoAccessorMethod] @@ -412,7 +412,7 @@ namespace Goo { public uint need_entire_subtree_update; public uint need_update; public weak Goo.CanvasItem parent; - public Goo.CanvasItemSimpleData simple_data; + public Goo.CanvasItemSimpleData? simple_data; [CCode (has_construct_function = false)] protected CanvasItemSimple (); public void changed (bool recompute_bounds); @@ -499,7 +499,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_path_get_type ()")] public class CanvasPath : Goo.CanvasItemSimple, Goo.CanvasItem { - public Goo.CanvasPathData path_data; + public Goo.CanvasPathData? path_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasPath (Goo.CanvasItem? parent, string path_data, ...); [NoAccessorMethod] @@ -547,7 +547,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_polyline_get_type ()")] public class CanvasPolyline : Goo.CanvasItemSimple, Goo.CanvasItem { - public Goo.CanvasPolylineData polyline_data; + public Goo.CanvasPolylineData? polyline_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasPolyline (Goo.CanvasItem? parent, bool close_path, int num_points, ...); [CCode (has_construct_function = false, type = "GooCanvasItem*")] @@ -607,7 +607,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_rect_get_type ()")] public class CanvasRect : Goo.CanvasItemSimple, Goo.CanvasItem { - public Goo.CanvasRectData rect_data; + public Goo.CanvasRectData? rect_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasRect (Goo.CanvasItem? parent, double x, double y, double width, double height, ...); [NoAccessorMethod] @@ -657,7 +657,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_table_get_type ()")] public class CanvasTable : Goo.CanvasGroup, Goo.CanvasItem { - public Goo.CanvasTableData table_data; + public Goo.CanvasTableData? table_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasTable (Goo.CanvasItem? parent, ...); [NoAccessorMethod] @@ -706,7 +706,7 @@ namespace Goo { [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_text_get_type ()")] public class CanvasText : Goo.CanvasItemSimple, Goo.CanvasItem { public double layout_width; - public Goo.CanvasTextData text_data; + public Goo.CanvasTextData? text_data; [CCode (has_construct_function = false, type = "GooCanvasItem*")] public CanvasText (Goo.CanvasItem? parent, string string, double x, double y, double width, Goo.CanvasAnchorType anchor, ...); public void get_natural_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect); @@ -978,10 +978,10 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", has_type_id = false)] public struct CanvasItemSimpleData { - public weak Goo.CanvasStyle style; + public Goo.CanvasStyle style; public Cairo.Matrix? transform; public GLib.Array clip_path_commands; - public weak string tooltip; + public string tooltip; public double visibility_threshold; public uint visibility; public uint pointer_events; @@ -1047,18 +1047,18 @@ namespace Goo { public double arrow_length; public double arrow_tip_length; [CCode (array_length = false)] - public weak double line_start[2]; + public double line_start[2]; [CCode (array_length = false)] - public weak double line_end[2]; + public double line_end[2]; [CCode (array_length = false)] - public weak double start_arrow_coords[10]; + public double start_arrow_coords[10]; [CCode (array_length = false)] - public weak double end_arrow_coords[10]; + public double end_arrow_coords[10]; } [CCode (cheader_filename = "goocanvas.h", has_type_id = false)] public struct CanvasPolylineData { public double coords; - public Goo.CanvasPolylineArrowData arrow_data; + public Goo.CanvasPolylineArrowData? arrow_data; public uint num_points; public uint close_path; public uint start_arrow; @@ -1084,10 +1084,10 @@ namespace Goo { public double width; public double height; [CCode (array_length = false)] - public weak Goo.CanvasTableDimension dimensions[2]; + public Goo.CanvasTableDimension dimensions[2]; public double border_width; - public weak GLib.Array children; - public weak Goo.CanvasTableLayoutData layout_data; + public GLib.Array children; + public Goo.CanvasTableLayoutData? layout_data; } [CCode (cheader_filename = "goocanvas.h", has_type_id = false)] public struct CanvasTableDimension { @@ -1098,7 +1098,7 @@ namespace Goo { } [CCode (cheader_filename = "goocanvas.h", has_type_id = false)] public struct CanvasTextData { - public weak string text; + public string text; public double x; public double y; public double width; diff --git a/vapi/metadata/GooCanvas-2.0.metadata b/vapi/metadata/GooCanvas-2.0.metadata index d2b436e21..56fc0852f 100644 --- a/vapi/metadata/GooCanvas-2.0.metadata +++ b/vapi/metadata/GooCanvas-2.0.metadata @@ -21,22 +21,46 @@ CANVAS_POLYLINE_NUM_ARROW_POINTS name="NUM_ARROW_POINTS" canvas_item*_class_* skip +*Data + .* unowned=false + //Upstream Canvas .*#field skip .convert_bounds_to_item_space.bounds ref unowned=false .marshal* skip +CanvasEllipse + .ellipse_data nullable unowned=false +CanvasImage + .image_data nullable unowned=false CanvasItemSimple + .simple_data nullable unowned=false .get_path_bounds.bounds out unowned=false CanvasItemModel .get_simple_transform.* out .get_simple_transform.model out=false .get_transform.transform out +CanvasGrid + .grid_data nullable unowned=false CanvasLineDash .dashes array array_length_field="num_dashes" unowned=false CanvasPoints .coords array array_length_field="num_points" unowned=false +CanvasPolyline + .polyline_data nullable unowned=false +CanvasPolylineData + .arrow_data nullable unowned=false CanvasItemSimpleData .clip_path_commands type="GLib.Array" +CanvasPath + .path_data nullable unowned=false CanvasPathData .path_commands type="GLib.Array" +CanvasRect + .rect_data nullable unowned=false +CanvasTable + .table_data nullable unowned=false +CanvasTableData + .layout_data nullable unowned=false +CanvasText + .text_data nullable unowned=false