Fix default free function for classes

Fixes bug 642362.

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index f9ec4fab97828528b7713fde7accf5a578601e7d..25500589955da66a79875d7af528a66d4a0bbbbb 100644 (file)
--- 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 4195244414fff3cb00bbf660a4018cc9d6a9c44c..e2ffc544feaa138422b7fd924a6f659bb69606b7 100644 (file)
--- 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;