When adding ancestral prerequisites, add the grandparents, not the

Thu Jul 25 20:34:39 2002  Owen Taylor  <otaylor@redhat.com>

        * gtype.c (g_type_interface_add_prerequisite): When
        adding ancestral prerequisites, add the grandparents,
        not the siblings. (Problem found by Jon Trowbridge, patch from
        Dave Camp, #86879)

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index d5f63ee..04cc7e5 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 25 20:34:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtype.c (g_type_interface_add_prerequisite): When
+       adding ancestral prerequisites, add the grandparents,
+       not the siblings. (Problem found by Jon Trowbridge, patch from 
+       Dave Camp, #86879)
+
 2002-07-05  Anders Carlsson  <andersca@gnu.org>
 
        * gobject.c (g_object_base_class_finalize): Remove debugging

diff --git a/gobject/gtype.c b/gobject/gtype.c
index 3cac593..21e7385 100644 (file)
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1202,13 +1202,12 @@ g_type_interface_add_prerequisite (GType interface_type,
     }
   else if (NODE_IS_IFACE (prerequisite_node))
     {
-      GType *dependants;
-      guint n_dependants, i;
+      GType *prerequisites;
+      guint i;
       
-      dependants = iface_node_get_dependants_array_L (prerequisite_node);
-      n_dependants = dependants ? dependants[0] : 0;
-      for (i = 1; i <= n_dependants; i++)
-       type_iface_add_prerequisite_W (iface, lookup_type_node_I (dependants[i]));
+      prerequisites = IFACE_NODE_PREREQUISITES (prerequisite_node);
+      for (i = 0; i < IFACE_NODE_N_PREREQUISITES (prerequisite_node); i++)
+       type_iface_add_prerequisite_W (iface, lookup_type_node_I (prerequisites[i]));
       type_iface_add_prerequisite_W (iface, prerequisite_node);
       G_WRITE_UNLOCK (&type_rw_lock);
     }