girparser: Ensure that cname of guessed accessor methods is correct

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 60b2342db533046121fdcca2a9122b94db6dd505..383bbdd06f9592cd33af8cfb7349e72f30abbd03 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -718,7 +718,13 @@ public class Vala.GirParser : CodeVisitor {
                                                }
                                        }
                                        var getter = parent.lookup ("get_%s".printf (name));
+                                       if (getter != null && getter.get_cname () != parent.get_lower_case_cprefix() + "get_" + name) {
+                                               getter = null;
+                                       }
                                        var setter = parent.lookup ("set_%s".printf (name));
+                                       if (setter != null && setter.get_cname () != parent.get_lower_case_cprefix() + "set_" + name) {
+                                               setter = null;
+                                       }
                                        var prop = (Property) symbol;
                                        if (prop.no_accessor_method) {
                                                // property getter and setter must both match, otherwise it's NoAccessorMethod