From: Rafael Monica <monraaf@gmail.com>
Date: Wed, 4 Aug 2010 18:45:57 +0000 (-0700)
Subject: goocanvas: Several data type fixes.
X-Git-Tag: 0.9.5~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8cb9a497638f345aff26e69ac0d87374bb03e86;p=thirdparty%2Fvala.git

goocanvas: Several data type fixes.

Fixes bug 625268.
---

diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi
index 8c8b051d9..4bd8af272 100644
--- a/vapi/goocanvas.vapi
+++ b/vapi/goocanvas.vapi
@@ -29,12 +29,12 @@ namespace Goo {
 		public unowned Cairo.Context create_cairo_context ();
 		public virtual unowned Goo.CanvasItem create_item (Goo.CanvasItemModel model);
 		public static void create_path (GLib.Array<Goo.CanvasPathCommand> commands, Cairo.Context cr);
-		public void get_bounds (ref unowned double? left, ref unowned double? top, ref unowned double? right, ref unowned double? bottom);
+		public void get_bounds (out unowned double? left, out unowned double? top, out unowned double? right, out unowned double? bottom);
 		public double get_default_line_width ();
 		public unowned Goo.CanvasItem? get_item (Goo.CanvasItemModel model);
 		public unowned Goo.CanvasItem? get_item_at (double x, double y, bool is_pointer_event);
-		public unowned GLib.List<Goo.CanvasItem> get_items_at (double x, double y, bool is_pointer_event);
-		public unowned GLib.List<Goo.CanvasItem> get_items_in_area (Goo.CanvasBounds area, bool inside_area, bool allow_overlaps, bool include_containers);
+		public GLib.List<weak Goo.CanvasItem>? get_items_at (double x, double y, bool is_pointer_event);
+		public GLib.List<weak Goo.CanvasItem>? get_items_in_area (Goo.CanvasBounds area, bool inside_area, bool allow_overlaps, bool include_containers);
 		public unowned Goo.CanvasItem? get_root_item ();
 		public unowned Goo.CanvasItemModel? get_root_item_model ();
 		public double get_scale ();
diff --git a/vapi/packages/goocanvas/goocanvas-custom.vala b/vapi/packages/goocanvas/goocanvas-custom.vala
index e7e4b2913..e40de41ab 100644
--- a/vapi/packages/goocanvas/goocanvas-custom.vala
+++ b/vapi/packages/goocanvas/goocanvas-custom.vala
@@ -43,8 +43,8 @@ namespace Goo
 		public Canvas();
 		public static void create_path(GLib.Array<CanvasPathCommand> commands, Cairo.Context cr);
 		public static GLib.Array<CanvasPathCommand> parse_path_data (string path_data);
-		public unowned GLib.List<CanvasItem> get_items_at (double x, double y, bool is_pointer_event);
-		public unowned GLib.List<CanvasItem> get_items_in_area (Goo.CanvasBounds area, bool inside_area, bool allow_overlaps, bool include_containers);
+		public GLib.List<unowned CanvasItem>? get_items_at (double x, double y, bool is_pointer_event);
+		public GLib.List<unowned CanvasItem>? get_items_in_area (Goo.CanvasBounds area, bool inside_area, bool allow_overlaps, bool include_containers);
 	}
 
 	public class CanvasEllipse
diff --git a/vapi/packages/goocanvas/goocanvas.metadata b/vapi/packages/goocanvas/goocanvas.metadata
index 4b3f5b097..34a297a43 100644
--- a/vapi/packages/goocanvas/goocanvas.metadata
+++ b/vapi/packages/goocanvas/goocanvas.metadata
@@ -51,10 +51,10 @@ goo_canvas_convert_from_pixels.y is_ref="1"
 goo_canvas_convert_to_pixels.x is_ref="1"
 goo_canvas_convert_to_pixels.y is_ref="1"
 goo_canvas_create_path hidden="1"
-goo_canvas_get_bounds.left is_ref="1" nullable="1"
-goo_canvas_get_bounds.top is_ref="1" nullable="1"
-goo_canvas_get_bounds.right is_ref="1" nullable="1"
-goo_canvas_get_bounds.bottom is_ref="1" nullable="1"
+goo_canvas_get_bounds.left is_out="1" nullable="1"
+goo_canvas_get_bounds.top is_out="1" nullable="1"
+goo_canvas_get_bounds.right is_out="1" nullable="1"
+goo_canvas_get_bounds.bottom is_out="1" nullable="1"
 goo_canvas_get_root_item nullable="1"
 goo_canvas_get_root_item_model nullable="1"
 goo_canvas_get_static_root_item nullable="1"