[PD-cvs] pd/src desire.c,1.1.2.86,1.1.2.87

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15212

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
fixing swollen appendix again


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.86
retrieving revision 1.1.2.87
diff -C2 -d -r1.1.2.86 -r1.1.2.87
*** desire.c	2 Jul 2006 00:59:47 -0000	1.1.2.86
--- desire.c	2 Jul 2006 01:36:14 -0000	1.1.2.87
***************
*** 223,227 ****
  t_manager *manager_new (t_symbol *s, int argc, t_atom *argv) {
  	t_manager *self = (t_manager *)pd_new(manager_class);
- 	self->super.g_adix = appendix_new((t_gobj *)self);
  	self->q = queue_new();
  	self->clock = clock_new(self,(t_method)manager_call);
--- 223,226 ----
***************
*** 500,512 ****
  
  void glist_init(t_glist *x) {
!     /* zero out everyone except "pd" field */
!     memset(((char *)x) + sizeof(x->gl_pd), 0, sizeof(*x) - sizeof(x->gl_pd));
      x->gl_stub = gstub_new(x, 0);
      x->gl_valid = ++glist_valid;
      x->gl_xlabel = (t_symbol **)t_getbytes(0);
      x->gl_ylabel = (t_symbol **)t_getbytes(0);
!     ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x);
! /* the following is a hack */
!     if (hack) {
  	gobj_subscribe((t_gobj *)x,(t_gobj *)manager);
  	gobj_changed((t_gobj *)x,0);
--- 499,509 ----
  
  void glist_init(t_glist *x) {
!     /* zero out everyone except "pd" and "g_adix" fields */
!     memset(((char *)x) + sizeof(t_gobj), 0, sizeof(*x) - sizeof(t_gobj));
      x->gl_stub = gstub_new(x, 0);
      x->gl_valid = ++glist_valid;
      x->gl_xlabel = (t_symbol **)t_getbytes(0);
      x->gl_ylabel = (t_symbol **)t_getbytes(0);
!     if (hack) { /* only manage this canvas if it's not one of the 3 invisible builtin canvases */
  	gobj_subscribe((t_gobj *)x,(t_gobj *)manager);
  	gobj_changed((t_gobj *)x,0);
***************
*** 3727,3731 ****
  {
      t_binbuf *b;
!     hack = 0;
      if (garray_arraytemplatecanvas)
          return;
--- 3724,3728 ----
  {
      t_binbuf *b;
!     hack = 0; /* invisible canvases must be, uh, invisible */
      if (garray_arraytemplatecanvas)
          return;
***************
*** 3745,3749 ****
      glob_setfilename(0, &s_, &s_);
      binbuf_free(b);
!     hack = 1;
  }
  
--- 3742,3746 ----
      glob_setfilename(0, &s_, &s_);
      binbuf_free(b);
!     hack = 1; /* enable canvas visibility for upcoming canvases */
  }
  
***************
*** 5053,5057 ****
      printf("glist_add %p %p [%.*s]\n",x,y,bufn,buf);
      free(buf);
-     if (!y->g_adix) y->g_adix = appendix_new(y); /* mb: i found no better place for initing this */
      gobj_subscribe(y,(t_gobj *)x);
      gobj_changed(y,0);
--- 5050,5053 ----