[seed] [libseed] Real solution to the seed_gtype_construct recursion problem when inheriting from Seed defi

[Robert Carr <racarr src gnome org>]

commit 5200efdb207f460061e5f58ac5fab5096befc0dc
Author: Robert Carr <racarr gnome org>
Date:   Wed Jul 29 05:33:06 2009 -0400

    [libseed] Real solution to the seed_gtype_construct recursion problem when inheriting from Seed defined GTypes. In seed_gtype_construct, we see if our parent is also a Seed defined type (has constructor == seed_gtype_construct), and if so we chain up to it's parent. If not, we chain to our parent.

 libseed/seed-gtype.c |   53 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 15 deletions(-)
---
diff --git a/libseed/seed-gtype.c b/libseed/seed-gtype.c
index 14be6b5..41b956d 100644
--- a/libseed/seed-gtype.c
+++ b/libseed/seed-gtype.c
@@ -18,6 +18,8 @@
 #include "seed-private.h"
 #include <sys/mman.h>
 
+typedef  GObject * (*GObjectConstructCallback) (GType, guint, GObjectConstructParam *);
+
 GHashTable *gtype_iinits;
 
 JSClassRef seed_gtype_class;
@@ -219,25 +221,13 @@ seed_attach_methods_to_class_object (JSContextRef ctx,
 			&seed_gsignal_method_invoked, object);
 }
 
-static GObject *
-seed_gtype_construct (GType type,
-		      guint n_construct_params,
-		      GObjectConstructParam *construct_params)
+static void
+seed_gtype_call_construct (GType type, GObject *object)
 {
   JSContextRef ctx;
   JSObjectRef func, this_object;
   JSValueRef exception = NULL, args[1];
-  GObject *object;
-  GType parent;
-  GObjectClass *parent_class;
-  gchar *mes;
-
-  parent = g_type_parent (type);
-  parent_class = g_type_class_ref (parent);
-
-  object = parent_class->constructor (type, n_construct_params, construct_params);
-
-  g_type_class_unref (parent_class);
+  gchar * mes;
 
   func = g_hash_table_lookup (gtype_iinits, GINT_TO_POINTER (type));
   if (func)
@@ -260,6 +250,39 @@ seed_gtype_construct (GType type,
       JSGlobalContextRelease ((JSGlobalContextRef) ctx);
     }
 
+
+}
+
+static GObject *
+seed_gtype_construct (GType type,
+		      guint n_construct_params,
+		      GObjectConstructParam *construct_params)
+{
+  GObject *object;
+  GType parent;
+  GObjectClass *parent_class;
+
+  parent = g_type_parent (type);
+  parent_class = g_type_class_ref (parent);
+    
+  if (parent_class->constructor == seed_gtype_construct)
+    {
+      parent = g_type_parent (parent);
+
+      g_type_class_unref (parent_class);
+      parent_class = g_type_class_ref (parent);
+
+      object = parent_class->constructor (type, n_construct_params, construct_params);
+
+      g_type_class_unref (parent_class);
+    }
+  else
+    object = parent_class->constructor (type, n_construct_params, construct_params);
+  
+  seed_gtype_call_construct (type, object);
+  
+  g_type_class_unref (parent_class);
+
   return object;
 }