From: Jürg Billeter <j@bitron.ch>
Date: Mon, 14 Sep 2009 22:45:20 +0000 (+0200)
Subject: GAsync: Fix GSourceFunc callbacks in virtual methods
X-Git-Tag: 0.7.6~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5bd7d9c281891998f284eca8ae47ce8b95384f5;p=thirdparty%2Fvala.git

GAsync: Fix GSourceFunc callbacks in virtual methods
---

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index d0692c056..8413f3480 100644
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -426,7 +426,12 @@ public class Vala.MemberAccess : Expression {
 			klass = (f.binding == MemberBinding.CLASS);
 		} else if (member is Method) {
 			var m = (Method) member;
-			if (m.base_method != null) {
+			if (m.is_async_callback) {
+				// ensure to use right callback method for virtual/abstract async methods
+				m = analyzer.current_method.get_callback_method ();
+				symbol_reference = m;
+				member = symbol_reference;
+			} else if (m.base_method != null) {
 				// refer to base method to inherit default arguments
 				m = m.base_method;