Fix regression retriving GTypes from instances

The GValue marshalling code calls get_actual_gtype() on instances.
To handle that, we need three levels of recursion: from the
instance to the constructor, from the constructor to the GType
object and finally from GType object to the actual GType.

This regressed in df28a9c070459cc90b0ea0db19bf8e0568ac396a,
which was later reverted, but that left the original bug unfixed.

https://bugzilla.gnome.org/show_bug.cgi?id=699878

1 files changed, 21 insertions, 5 deletions

diff --git a/gi/gtype.c b/gi/gtype.c
index 850b926a..3d5f5ad3 100644
--- a/gi/gtype.c
+++ b/gi/gtype.c
@@ -145,9 +145,10 @@ gjs_gtype_create_gtype_wrapper (JSContext *context,
     return object;
 }
 
-GType
-gjs_gtype_get_actual_gtype (JSContext *context,
-                            JSObject  *object)
+static GType
+_gjs_gtype_get_actual_gtype (JSContext *context,
+                             JSObject  *object,
+                             int        recurse)
 {
     GType gtype = G_TYPE_INVALID;
     jsval gtype_val = JSVAL_VOID;
@@ -169,10 +170,25 @@ gjs_gtype_get_actual_gtype (JSContext *context,
             goto out;
     }
 
-    if (JSVAL_IS_OBJECT(gtype_val))
-        gtype = gjs_gtype_get_actual_gtype(context, JSVAL_TO_OBJECT(gtype_val));
+    if (recurse > 0 && JSVAL_IS_OBJECT(gtype_val))
+        gtype = _gjs_gtype_get_actual_gtype(context, JSVAL_TO_OBJECT(gtype_val), recurse - 1);
 
  out:
     JS_EndRequest(context);
     return gtype;
 }
+
+GType
+gjs_gtype_get_actual_gtype (JSContext *context,
+                            JSObject  *object)
+{
+    /* 2 means: recurse at most three times (including this
+       call).
+       The levels are calculated considering that, in the
+       worst case we need to go from instance to class, from
+       class to GType object and from GType object to
+       GType value.
+     */
+
+    return _gjs_gtype_get_actual_gtype(context, object, 2);
+}