fix: vfunc not found

lib/register-class.js

@@ -72,17 +72,14 @@ function setupVirtualFunctions(klass, klassGtype, parentGtype) {
 }
 
 function findVFunc(gtype, parentInfo, name) {
- let [vfuncInfo, _] = findVFuncOnParents(parentInfo, name)
+ let vfuncInfo = findVFuncOnParents(parentInfo, name)
  if (!vfuncInfo) {
  vfuncInfo = findVFuncOnInterfaces(gtype, name)
- // definedByParent = false
  }
  return vfuncInfo
 }
 
 function findVFuncOnParents(info, name) {
- let definedByParent = false;
-
  let parent = info
 
  /* Since it isn't possible to override a vfunc on
@@ -91,15 +88,32 @@ function findVFuncOnParents(info, name) {
  let [vfunc, _] =
  GI.object_info_find_vfunc_using_interfaces(parent, name, null)
 
- do {
- if (parent)
- vfunc = GI.object_info_find_vfunc(info, name)
+ if (vfunc) {
+ return vfunc
+ }
+
+ while (parent) {
+ vfunc = GI.object_info_find_vfunc(info, name)
+
+ if (vfunc) {
+ return vfunc
+ }
+
+ /* HACK: object_info_find_vfunc sometimes fail, so we also search for
+ * the matching entry manually. */
+ const n = GI.object_info_get_n_vfuncs(parent)
+ for (let i = 0; i < n; i++) {
+ const vfunc = GI.object_info_get_vfunc(parent, i)
+ const currentName = GI.BaseInfo_get_name.call(vfunc)
+ if (currentName === name) {
+ return vfunc
+ }
+ }
 
  parent = GI.object_info_get_parent(parent)
- definedByParent = true
- } while (!vfunc && parent)
+ }
 
- return [vfunc, definedByParent]
+ return null
 }
 
 function findVFuncOnInterfaces(gtype, name) {
@@ -163,18 +177,3 @@ function createGTypeName(klass) {
 function sanitizeGType(s) {
  return s.replace(/[^a-z0-9+_-]/gi, '_');
 }
-
-function getParents(klass) {
- const parents = []
-
- let current = klass
- do {
- let proto = Object.getPrototypeOf(current.prototype)
- current = proto ? proto.constructor : null
- if (!current)
- break
- parents.push(current)
- } while (current)
-
- return parents
-}