gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-396-gba936e6)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ba936e6bb6c321b7c9d433a8276d7cccd17c9889 (commit)
      from  9928a19d3374c5d7ff672f8435a5f29476b2bba2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 libgeda/src/a_basic.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


=================
 Commit Messages
=================

commit ba936e6bb6c321b7c9d433a8276d7cccd17c9889
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Thu Dec 18 22:52:42 2008 +0000

    libgeda: Fix complex_parent for prim_objs of embedded objects
    
    When we read in the embedded objects for a complex, we need to
    set the complex_parent argument for each of them to point at the
    complex.
    
    This bug manifested in failed netlisting for embedded objects,
    and has been manifest since:
    commit f4dab83b1ca0e197f02f520a6ae525aeac5a252d
    gnetlist: Use the complex_parent property of an OBJECT, not the HEAD node.
    
    The omission which made this a latent bug was in:
    commit ec2e929742bb682be52d02818916b1f57c343e48
    libgeda: Set complex_parent on all prim objects, not just their HEAD node

:100644 100644 b862812... ca2db3a... M	libgeda/src/a_basic.c

=========
 Changes
=========

commit ba936e6bb6c321b7c9d433a8276d7cccd17c9889
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Thu Dec 18 22:52:42 2008 +0000

    libgeda: Fix complex_parent for prim_objs of embedded objects
    
    When we read in the embedded objects for a complex, we need to
    set the complex_parent argument for each of them to point at the
    complex.
    
    This bug manifested in failed netlisting for embedded objects,
    and has been manifest since:
    commit f4dab83b1ca0e197f02f520a6ae525aeac5a252d
    gnetlist: Use the complex_parent property of an OBJECT, not the HEAD node.
    
    The omission which made this a latent bug was in:
    commit ec2e929742bb682be52d02818916b1f57c343e48
    libgeda: Set complex_parent on all prim objects, not just their HEAD node

diff --git a/libgeda/src/a_basic.c b/libgeda/src/a_basic.c
index b862812..ca2db3a 100644
--- a/libgeda/src/a_basic.c
+++ b/libgeda/src/a_basic.c
@@ -272,6 +272,7 @@ GList *o_read_buffer (TOPLEVEL *toplevel, GList *object_list,
   GList *object_list_save=NULL;
   OBJECT *new_obj=NULL;
   GList *new_obj_list;
+  GList *iter;
   unsigned int release_ver;
   unsigned int fileformat_ver;
   unsigned int current_fileformat_ver;
@@ -438,6 +439,13 @@ GList *o_read_buffer (TOPLEVEL *toplevel, GList *object_list,
           new_obj->complex->prim_objs = object_list;
           object_list = object_list_save;
 
+          /* set the parent field now */
+          for (iter = new_obj->complex->prim_objs;
+               iter != NULL; iter = g_list_next (iter)) {
+            OBJECT *tmp = iter->data;
+            tmp->complex_parent = new_obj;
+          }
+
           o_recalc_single_object (toplevel, new_obj);
 
           embedded_level--;




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs