gEDA-cvs: CVS update: g_rc.nw

[cvspsrv@xxxxxxxx]

  User: ahvezda 
  Date: 06/07/04 21:04:34

  Modified:    .        g_rc.nw o_complex_basic.nw
  Log:
  Fixed attribute promotion bugs and faulty libgeda.pc.in
  
  
  
  
  Revision  Changes    Path
  1.18      +2 -1      eda/geda/devel/libgeda/noweb/g_rc.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: g_rc.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/g_rc.nw,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- g_rc.nw	20 May 2006 19:02:31 -0000	1.17
  +++ g_rc.nw	5 Jul 2006 01:04:33 -0000	1.18
  @@ -1070,7 +1070,8 @@
     if (default_always_promote_attributes) {
       free (default_always_promote_attributes);
     }
  -  default_always_promote_attributes = g_strdup (SCM_STRING_CHARS (scmsymname));
  +  default_always_promote_attributes = 
  +    g_strdup_printf(" %s ", SCM_STRING_CHARS (scmsymname));
   
     return SCM_BOOL_T;
   }
  
  
  
  1.28      +11 -2     eda/geda/devel/libgeda/noweb/o_complex_basic.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_complex_basic.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/o_complex_basic.nw,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- o_complex_basic.nw	20 May 2006 19:02:31 -0000	1.27
  +++ o_complex_basic.nw	5 Jul 2006 01:04:33 -0000	1.28
  @@ -421,6 +421,8 @@
   {
     char *name = NULL;
     char *value = NULL;
  +  char *padded_name = NULL;
  +  int promotableAttribute = FALSE;
     char *ptr;
   
     if (object->type != OBJ_TEXT || object->attribute || object->attached_to)
  @@ -447,12 +449,19 @@
     {
       if (o_attrib_get_name_value(object->text->string, &name, &value))
       {
  -      if (strstr(w_current->always_promote_attributes, name))
  +      padded_name = g_strdup_printf(" %s ", name);
  +      if (strstr(w_current->always_promote_attributes, padded_name))
         {
   	/* Yes the name of the attribute was in the always promote */
           /* attributes list */
  -        return TRUE;
  +        promotableAttribute = TRUE;
         }
  +      
  +      g_free(padded_name);
  +      if (name) g_free(name);
  +      if (value) g_free(value);
  +      if (promotableAttribute)
  +	return TRUE;
       }
     }
   
  
  
  
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs