[PD-cvs] pd/src desire.c,1.1.2.217.2.184,1.1.2.217.2.185

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c 
Log Message:
fix for error report upon save


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.184
retrieving revision 1.1.2.217.2.185
diff -C2 -d -r1.1.2.217.2.184 -r1.1.2.217.2.185
*** desire.c	3 Aug 2007 00:26:43 -0000	1.1.2.217.2.184
--- desire.c	3 Aug 2007 05:23:04 -0000	1.1.2.217.2.185
***************
*** 102,107 ****
  		binbuf_addv(b,"s",k);
  		binbuf_add(b,al->c,al->v);
! 		if (size_t(i+1)==h->size()) binbuf_addv(b, ";");
! 		else binbuf_addv(b,"t",",");
  		i++;
          }
--- 102,106 ----
  		binbuf_addv(b,"s",k);
  		binbuf_add(b,al->c,al->v);
! 		if (size_t(i+1)==h->size()) binbuf_addv(b, ";"); else binbuf_addv(b,"t",",");
  		i++;
          }
***************
*** 2434,2438 ****
  #endif
  
! /* fucntions to read and write canvases to files: canvas_savetofile() writes a root canvas to a "pd" file.
     (Reading "pd" files is done simply by passing the contents to the pd message interpreter.)
     Alternatively, the  glist_read() and glist_write() functions read and write "data" from and to files
--- 2433,2437 ----
  #endif
  
! /* functions to read and write canvases to files: canvas_savetofile() writes a root canvas to a "pd" file.
     (Reading "pd" files is done simply by passing the contents to the pd message interpreter.)
     Alternatively, the  glist_read() and glist_write() functions read and write "data" from and to files
***************
*** 2781,2786 ****
  /* ------ functions to save and restore canvases (patches) recursively. ----*/
  
! /* save to a binbuf, called recursively; cf. canvas_savetofile() which
!    saves the document, and is only called on root canvases. */
  void canvas_savecontainerto(t_canvas *x, t_binbuf *b) {
      /* have to go to original binbuf to find out how we were named. */
--- 2780,2784 ----
  /* ------ functions to save and restore canvases (patches) recursively. ----*/
  
! /* save to a binbuf, called recursively; cf. canvas_savetofile() which saves the document, and is only called on root canvases. */
  void canvas_savecontainerto(t_canvas *x, t_binbuf *b) {
      /* have to go to original binbuf to find out how we were named. */
***************
*** 2875,2881 ****
      canvas_savetemplatesto(x, b);
      canvas_saveto(x, b);
!     if (binbuf_write(b, filename->name, dir->name, 0)) {
! 	sys_ouch();
!     } else {
  	/* if not an abstraction, reset title bar and directory */
          if (!x->owner) canvas_rename(x, filename, dir);
--- 2873,2877 ----
      canvas_savetemplatesto(x, b);
      canvas_saveto(x, b);
!     if (!binbuf_write(b, filename->name, dir->name, 0)) {
  	/* if not an abstraction, reset title bar and directory */
          if (!x->owner) canvas_rename(x, filename, dir);
***************
*** 7441,7446 ****
  
  void sys_ouch () {
!     if (*errobject) error("%s: %s", errobject, errstring);
!     else error("%s", errstring);
  }
  
--- 7437,7441 ----
  
  void sys_ouch () {
!     if (*errobject) error("%s: %s", errobject, errstring); else error("%s", errstring);
  }