From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 22 Apr 2011 16:23:34 +0000 (+0200)
Subject: Fix default free function for classes
X-Git-Tag: 0.13.0~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a90cf0a8e993501d708a070da3a870fe99deff00;p=thirdparty%2Fvala.git

Fix default free function for classes

Fixes bug 642362.
---

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index f9ec4fab9..255005899 100644
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -923,14 +923,14 @@ public class Vala.Class : ObjectTypeSymbol {
 	}
 
 	public string get_default_free_function () {
+		if (base_class != null) {
+			return base_class.get_free_function ();
+		}
 		return get_lower_case_cprefix () + "free";
 	}
 
 	public override string? get_free_function () {
 		if (free_function == null) {
-			if (base_class != null) {
-				return base_class.get_free_function ();
-			}
 			free_function = get_default_free_function ();
 		}
 		return free_function;
diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi
index 419524441..e2ffc544f 100644
--- a/vapi/gstreamer-base-0.10.vapi
+++ b/vapi/gstreamer-base-0.10.vapi
@@ -344,7 +344,7 @@ namespace Gst {
 		public bool skip_string_utf8 ();
 	}
 	[Compact]
-	[CCode (cheader_filename = "gst/base/gstbytewriter.h")]
+	[CCode (free_function = "gst_byte_writer_free", cheader_filename = "gst/base/gstbytewriter.h")]
 	public class ByteWriter : Gst.ByteReader {
 		public uint alloc_size;
 		public bool fixed;