From: Jakob Westhoff <jakob@westhoffswelt.de>
Date: Fri, 1 Jan 2010 16:34:47 +0000 (+0100)
Subject: poppler-glib: Fix PopplerRectangle binding
X-Git-Tag: 0.7.10~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fde75e70544551c862109808af0996fe1f76867;p=thirdparty%2Fvala.git

poppler-glib: Fix PopplerRectangle binding

Fixes bug 605853.
---

diff --git a/vapi/packages/poppler-glib/poppler-glib.metadata b/vapi/packages/poppler-glib/poppler-glib.metadata
index 871e8dc4b..51f4d9546 100644
--- a/vapi/packages/poppler-glib/poppler-glib.metadata
+++ b/vapi/packages/poppler-glib/poppler-glib.metadata
@@ -10,5 +10,7 @@ poppler_link_mapping_copy transfer_ownership="1"
 poppler_page_get_size.width is_out="1"
 poppler_page_get_size.height is_out="1"
 poppler_page_transition_copy transfer_ownership="1"
-poppler_rectangle_copy transfer_ownership="1"
-
+PopplerRectangle is_value_type="1"
+poppler_rectangle_new hidden="1"
+poppler_rectangle_copy hidden="1"
+poppler_rectangle_free hidden="1"
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index ef3b7c509..181501fec 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -189,7 +189,7 @@ namespace Poppler {
 	[Compact]
 	[CCode (copy_function = "poppler_form_field_mapping_copy", type_id = "POPPLER_TYPE_FORM_FIELD_MAPPING", cheader_filename = "poppler.h")]
 	public class FormFieldMapping {
-		public weak Poppler.Rectangle area;
+		public Poppler.Rectangle area;
 		public weak Poppler.FormField field;
 		[CCode (has_construct_function = false)]
 		public FormFieldMapping ();
@@ -198,7 +198,7 @@ namespace Poppler {
 	[Compact]
 	[CCode (copy_function = "poppler_image_mapping_copy", type_id = "POPPLER_TYPE_IMAGE_MAPPING", cheader_filename = "poppler.h")]
 	public class ImageMapping {
-		public weak Poppler.Rectangle area;
+		public Poppler.Rectangle area;
 		public weak Gdk.Pixbuf image;
 		[CCode (has_construct_function = false)]
 		public ImageMapping ();
@@ -219,7 +219,7 @@ namespace Poppler {
 	[CCode (copy_function = "poppler_link_mapping_copy", type_id = "POPPLER_TYPE_LINK_MAPPING", cheader_filename = "poppler.h")]
 	public class LinkMapping {
 		public weak Poppler.Action action;
-		public weak Poppler.Rectangle area;
+		public Poppler.Rectangle area;
 		[CCode (has_construct_function = false)]
 		public LinkMapping ();
 		public Poppler.LinkMapping copy ();
@@ -272,16 +272,12 @@ namespace Poppler {
 		public PageTransition ();
 		public Poppler.PageTransition copy ();
 	}
-	[Compact]
-	[CCode (copy_function = "poppler_rectangle_copy", type_id = "POPPLER_TYPE_RECTANGLE", cheader_filename = "poppler.h")]
-	public class Rectangle {
+	[CCode (type_id = "POPPLER_TYPE_RECTANGLE", cheader_filename = "poppler.h")]
+	public struct Rectangle {
 		public double x1;
-		public double x2;
 		public double y1;
+		public double x2;
 		public double y2;
-		[CCode (has_construct_function = false)]
-		public Rectangle ();
-		public Poppler.Rectangle copy ();
 	}
 	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = "0", cheader_filename = "poppler.h")]
 	public enum ActionType {