From: Evan Nemerson <evan@nemerson.com>
Date: Wed, 4 Jun 2014 22:01:16 +0000 (-0700)
Subject: girparser: only replace ref/unref funcs with better matches
X-Git-Tag: 0.25.1~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dc6448fb40f9d44faf4e285b9d9ddc16a29d140;p=thirdparty%2Fvala.git

girparser: only replace ref/unref funcs with better matches
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index b1561e86e..6af28916d 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -3199,9 +3199,9 @@ public class Vala.GirParser : CodeVisitor {
 			} else if (reader.name == "method") {
 				parse_method ("method");
 				var cname = old_current.get_cname ();
-				if (cname.has_suffix ("_ref")) {
+				if (cname.has_suffix ("_ref") && (ref_method == null || old_current.name == "ref")) {
 					ref_method = old_current;
-				} else if (cname.has_suffix ("_unref")) {
+				} else if (cname.has_suffix ("_unref") && (unref_method == null || old_current.name == "unref")) {
 					unref_method = old_current;
 				}
 			} else if (reader.name == "function") {