Do not write default param_spec_function in VAPI files

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index 7bb05324922f2af794da927f6c0c4fc702f07fc0..e4b193f05ee5cfa223d56cfa6ab1de9bc150345d 100644 (file)
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -721,20 +721,24 @@ public class Vala.Class : ObjectTypeSymbol {
 
        public override string? get_param_spec_function () {
                if (param_spec_function == null) {
-                       if (is_fundamental ()) {
-                               param_spec_function = get_lower_case_cname ("param_spec_");
-                       } else if (base_class != null) {
-                               param_spec_function = base_class.get_param_spec_function ();
-                       } else if (get_type_id () == "G_TYPE_POINTER") {
-                               param_spec_function = "g_param_spec_pointer";
-                       } else {
-                               param_spec_function = "g_param_spec_boxed";
-                       }
+                       param_spec_function = get_default_param_spec_function ();
                }
 
                return param_spec_function;
        }
 
+       public string? get_default_param_spec_function () {
+               if (is_fundamental ()) {
+                       return get_lower_case_cname ("param_spec_");
+               } else if (base_class != null) {
+                       return base_class.get_param_spec_function ();
+               } else if (get_type_id () == "G_TYPE_POINTER") {
+                       return "g_param_spec_pointer";
+               } else {
+                       return "g_param_spec_boxed";
+               }
+       }
+
        public override string? get_get_value_function () {
                if (get_value_function == null) {
                        if (is_fundamental ()) {

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index 7d082bf15bc7cb9ecb28d09945bc18feeab35bf8..dbc1cb8916edcd33b444006acdd669bfb7cfe306 100644 (file)
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -199,8 +199,7 @@ public class Vala.CodeWriter : CodeVisitor {
                        write_string ("type_id = \"%s\", ".printf (cl.get_type_id ()));
                }
 
-               if (cl.get_param_spec_function () != null
-                   && (cl.base_class == null || cl.get_param_spec_function () != cl.base_class.get_param_spec_function ())) {
+               if (cl.get_param_spec_function () != cl.get_default_param_spec_function ()) {
                        write_string ("param_spec_function = \"%s\", ".printf (cl.get_param_spec_function ()));
                }