codegen: Actually create method cast for base interface method as needed

Keep the fallback to base method for now.

This will silence some incompatible pointer type warnings.

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 3ce231702b42a041003edfc72fa252357d627656..7c1f1cf035f086680e4796d0c7f5c4163f680085 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1483,10 +1483,11 @@ public class Vala.GTypeModule : GErrorModule {
                                        // method inherited from base class
 
                                        var base_method = cl_method;
-                                       if (cl_method.base_method != null) {
-                                               base_method = cl_method.base_method;
-                                       } else if (cl_method.base_interface_method != null) {
+                                       if (cl_method.base_interface_method != null) {
                                                base_method = cl_method.base_interface_method;
+                                       } else if (cl_method.base_method != null) {
+                                               //FIXME should this ever be possible here?
+                                               base_method = cl_method.base_method;
                                        }
 
                                        generate_method_declaration (base_method, cfile);