[PD-cvs] pd/src desire.c, 1.1.2.111, 1.1.2.112 SConscript, 1.1.4.53, 1.1.4.54

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c SConscript 
Log Message:
merged g_rtext.c into desire.c


Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.53
retrieving revision 1.1.4.54
diff -C2 -d -r1.1.4.53 -r1.1.4.54
*** SConscript	19 Aug 2006 15:23:40 -0000	1.1.4.53
--- SConscript	20 Aug 2006 20:07:45 -0000	1.1.4.54
***************
*** 44,48 ****
      )
  
- 
  opt.Update(pdenv)
  
--- 44,47 ----
***************
*** 59,64 ****
    d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c
  
-   g_rtext.c
- 
    m_atom.c m_binbuf.c m_class.c m_conf.c m_fifo.c
    m_glob.c m_memory.c m_obj.c m_pd.c m_sched.c m_simd.c
--- 58,61 ----
***************
*** 82,86 ****
          g_array.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c
          g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c
! 
          s_print.c
      """)
--- 79,83 ----
          g_array.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c
          g_readwrite.c g_io.c g_scalar.c g_template.c g_traversal.c
! 	g_rtext.c
          s_print.c
      """)

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.111
retrieving revision 1.1.2.112
diff -C2 -d -r1.1.2.111 -r1.1.2.112
*** desire.c	20 Aug 2006 20:05:55 -0000	1.1.2.111
--- desire.c	20 Aug 2006 20:07:45 -0000	1.1.2.112
***************
*** 4958,4962 ****
      /* if (glist_isvisible(x)) gobj_vis(y,x,1); */
      /* if (glist_isvisible(x)) pd_upload(y);*/
!     pd_upload(y);
  
      y->g_next = 0;
--- 4958,4962 ----
      /* if (glist_isvisible(x)) gobj_vis(y,x,1); */
      /* if (glist_isvisible(x)) pd_upload(y);*/
!     pd_upload(y); /*FIXME*/
  
      y->g_next = 0;
***************
*** 12914,12918 ****
  /* ---------------------------------------------------------------- */
  /* formerly g_rtext.c */
! #if 0
  #include <stdlib.h>
  #include <string.h>
--- 12914,12918 ----
  /* ---------------------------------------------------------------- */
  /* formerly g_rtext.c */
! 
  #include <stdlib.h>
  #include <string.h>
***************
*** 13454,13456 ****
      rtext_senditup(x, SEND_UPDATE, &w, &h, &indx);
  }
! #endif /*0*/
\ No newline at end of file
--- 13454,13456 ----
      rtext_senditup(x, SEND_UPDATE, &w, &h, &indx);
  }
!