[PD-cvs] pd/src desire.c, 1.1.2.217.2.132, 1.1.2.217.2.133 kernel.c, 1.1.2.41, 1.1.2.42

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c kernel.c 
Log Message:
finished coding the scheduled deletion


Index: kernel.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -C2 -d -r1.1.2.41 -r1.1.2.42
*** kernel.c	15 Jan 2007 23:56:18 -0000	1.1.2.41
--- kernel.c	16 Jan 2007 00:56:35 -0000	1.1.2.42
***************
*** 326,330 ****
      }
      /* schedule for deletion if need to keep the allocation around */
!     if (c->gobj && (long)hash_get(object_table,x)|2) {
  	hash_set(object_table,x,(void *)((long)hash_get(object_table,x)&~1));
      } else pd_free_zombie(x);
--- 326,331 ----
      }
      /* schedule for deletion if need to keep the allocation around */
!     if (c->gobj && ((long)hash_get(object_table,x)|2)) {
! 	gobj_changed((t_gobj *)x,"");
  	hash_set(object_table,x,(void *)((long)hash_get(object_table,x)&~1));
      } else pd_free_zombie(x);

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.132
retrieving revision 1.1.2.217.2.133
diff -C2 -d -r1.1.2.217.2.132 -r1.1.2.217.2.133
*** desire.c	15 Jan 2007 23:56:16 -0000	1.1.2.217.2.132
--- desire.c	16 Jan 2007 00:56:32 -0000	1.1.2.217.2.133
***************
*** 737,741 ****
      while ((y = x->list)) canvas_delete(x, y);
      canvas_vis(x, 0);
-     sys_mgui(x,"delete","");
      if (x->name != s_Pd) pd_unbind(x,canvas_makebindsym(x->name));
      if (x->env) {
--- 737,740 ----
***************
*** 1128,1132 ****
          if (from == from_ && t.outlet == outlet &&
              to   == to_   && t.inlet  == inlet) {
- 	  //sys_mgui(oc,"delete","");
  	  obj_disconnect(t.from, t.outlet, t.to, t.inlet);
            break;
--- 1127,1130 ----
***************
*** 2221,2225 ****
      if (drawcommand) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(canvas_getcanvas(x)->name)), 2);
      canvas_deletelinesfor(x,(t_text *)y);
-     sys_mgui(y,"delete","");
      if (x->list == y) {
  	x->list = y->g_next;
--- 2219,2222 ----
***************
*** 6354,6358 ****
  
  void pd_upload(t_gobj *self) {
! 	if (!(long)hash_get(object_table,self)&1) {
  		sys_mgui(self,"delete","");
  		pd_free_zombie(self);
--- 6351,6356 ----
  
  void pd_upload(t_gobj *self) {
! 	long alive = (long)hash_get(object_table,self) & 1;
! 	if (!alive) {
  		sys_mgui(self,"delete","");
  		pd_free_zombie(self);