[PD-cvs] pd/src desire.tk,1.1.2.600.2.232,1.1.2.600.2.233

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fixed pasting of floatatoms, symbolatoms and subpatches


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.232
retrieving revision 1.1.2.600.2.233
diff -C2 -d -r1.1.2.600.2.232 -r1.1.2.600.2.233
*** desire.tk	14 Jul 2007 01:10:11 -0000	1.1.2.600.2.232
--- desire.tk	14 Jul 2007 01:42:46 -0000	1.1.2.600.2.233
***************
*** 273,276 ****
--- 273,277 ----
  proc netsend {message {callback noserial}} {
  	global serial replyset sock
+ 	if {$message == ""} {error "empty message... surely a mistake"}
  	if {$sock == ""} {error "connection to server needed for doing this"}
  	if {[string compare $callback noserial]} {
***************
*** 3411,3415 ****
  		switch $type {
  			"" {}
! 			canvas {set in 1; set goto [list $self new_object_select]}
  			connect {
  				mset {from outlet to inlet} [lrange $mess 2 end]
--- 3412,3416 ----
  		switch $type {
  			"" {}
! 			canvas {netsend $mess}
  			connect {
  				mset {from outlet to inlet} [lrange $mess 2 end]
***************
*** 3417,3436 ****
  				set mess2 [list #X connect [expr $from+$count] $outlet [expr $to+$count] $inlet]
  				if {$in} {set goto ""} else {
! 					set mess $mess2
! 					set goto [list $self new_wire_select]
  				}
  			}
! 			restore {set in 0; set goto "";set mess [$self paste_coords $mess $offset]}
  			default {
  				if {$in} {set goto ""} else {
! 					set mess [$self paste_coords $mess $offset]
! 					set goto [list $self new_object_select]
  				}
  			}
  		}
- 		switch $goto {
- 			"" {netsend $mess}
- 			default {netsend $mess $goto}
- 		}
  	}
  	netsend [list #X pop 1]
--- 3418,3431 ----
  				set mess2 [list #X connect [expr $from+$count] $outlet [expr $to+$count] $inlet]
  				if {$in} {set goto ""} else {
! 					netsend $mess2 [list $self new_wire_select]
  				}
  			}
! 			restore {incr in -1; netsend [$self paste_coords $mess $offset]}
  			default {
  				if {$in} {set goto ""} else {
! 					netsend [$self paste_coords $mess $offset] [list $self new_object_select]
  				}
  			}
  		}
  	}
  	netsend [list #X pop 1]