[vala/wip/goocanvas-2.0] goocanvas-2.0: Fix some field ownerships and types

[Rico Tzschichholz <ricotz src gnome org>]

commit 261c8dbf79287a49e7d0a6b34232242622df9f03
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Aug 7 21:45:22 2020 +0200

    goocanvas-2.0: Fix some field ownerships and types
    
    Fixes https://gitlab.gnome.org/GNOME/vala/issues/1057

 vapi/goocanvas-2.0.vapi              | 22 +++++++++++-----------
 vapi/metadata/GooCanvas-2.0.metadata |  6 ++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/vapi/goocanvas-2.0.vapi b/vapi/goocanvas-2.0.vapi
index 6aaf4bd4d..f3f7db47c 100644
--- a/vapi/goocanvas-2.0.vapi
+++ b/vapi/goocanvas-2.0.vapi
@@ -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);
@@ -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<Goo.CanvasPathCommand?> clip_path_commands;
-               public weak string tooltip;
+               public string tooltip;
                public double visibility_threshold;
                public uint visibility;
                public uint pointer_events;
@@ -1047,13 +1047,13 @@ 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 {
@@ -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<void*> children;
-               public weak Goo.CanvasTableLayoutData layout_data;
+               public GLib.Array<void*> 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..02489692f 100644
--- a/vapi/metadata/GooCanvas-2.0.metadata
+++ b/vapi/metadata/GooCanvas-2.0.metadata
@@ -21,12 +21,16 @@ 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
 CanvasItemSimple
+       .simple_data nullable unowned=false
        .get_path_bounds.bounds out unowned=false
 CanvasItemModel
        .get_simple_transform.* out
@@ -40,3 +44,5 @@ CanvasItemSimpleData
        .clip_path_commands type="GLib.Array<Goo.CanvasPathCommand?>"
 CanvasPathData
        .path_commands type="GLib.Array<Goo.CanvasPathCommand?>"
+CanvasTableData
+       .layout_data nullable unowned=false