diff options
Diffstat (limited to 'vala/valamethod.vala')
| -rw-r--r-- | vala/valamethod.vala | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/vala/valamethod.vala b/vala/valamethod.vala index c2de41d21..9f397c4cc 100644 --- a/vala/valamethod.vala +++ b/vala/valamethod.vala @@ -493,6 +493,10 @@ public class Vala.Method : Subroutine { private void find_base_class_method (Class cl) { var sym = cl.scope.lookup (name); + if (sym is Signal) { + var sig = (Signal) sym; + sym = sig.default_handler; + } if (sym is Method) { var base_method = (Method) sym; if (base_method.is_abstract || base_method.is_virtual) { @@ -506,20 +510,6 @@ public class Vala.Method : Subroutine { _base_method = base_method; return; } - } else if (sym is Signal) { - var sig = (Signal) sym; - if (sig.is_virtual) { - var base_method = sig.default_handler; - string invalid_match; - if (!compatible (base_method, out invalid_match)) { - error = true; - Report.error (source_reference, "overriding method `%s' is incompatible with base method `%s': %s.".printf (get_full_name (), base_method.get_full_name (), invalid_match)); - return; - } - - _base_method = base_method; - return; - } } if (cl.base_class != null) { @@ -532,6 +522,10 @@ public class Vala.Method : Subroutine { foreach (DataType type in cl.get_base_types ()) { if (type.data_type is Interface) { var sym = type.data_type.scope.lookup (name); + if (sym is Signal) { + var sig = (Signal) sym; + sym = sig.default_handler; + } if (sym is Method) { var base_method = (Method) sym; if (base_method.is_abstract || base_method.is_virtual) { |