[Amsn-commits] msn gui.tcl,1.1280,1.1281 preferences.tcl,1.108,1.109 msnp2p.tcl,1.59,1.60 picture.tcl,1.22,1.23 protocol.tcl,1.812,1.813 chatwindow.tcl,1.256,1.257 msncam.tcl,1.148,1.149 plugins.tcl,1.137,1.138 balloon.tcl,1.39,1.40

[Karel D. <sc...@us...>]

Update of /cvsroot/amsn/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3185

Modified Files:
	gui.tcl preferences.tcl msnp2p.tcl picture.tcl protocol.tcl 
	chatwindow.tcl msncam.tcl plugins.tcl balloon.tcl 
Log Message:
mem savings etc

Index: preferences.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/preferences.tcl,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** preferences.tcl	27 Mar 2006 15:50:29 -0000	1.108
--- preferences.tcl	19 Apr 2006 13:20:21 -0000	1.109
***************
*** 2553,2557 ****
  
      
!     bind .cfg <Destroy> "RestorePreferences %W"
  
      wm state .cfg normal
--- 2553,2557 ----
  
      
!     bind .cfg <Destroy> "RestorePreferences %W; array unset myconfig"
  
      wm state .cfg normal

Index: chatwindow.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/chatwindow.tcl,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** chatwindow.tcl	18 Apr 2006 23:17:25 -0000	1.256
--- chatwindow.tcl	19 Apr 2006 13:20:21 -0000	1.257
***************
*** 1470,1474 ****
  		if { [::skin::getKey chat_top_pixmap] } {
  			set bg "::$top.bg"
! 			set topimg [image create photo] ;#gets destroyed
  			$topimg copy [::skin::loadPixmap cwtopback]
  			::picture::Colorize $topimg [::skin::getKey topbarbg]
--- 1470,1474 ----
  		if { [::skin::getKey chat_top_pixmap] } {
  			set bg "::$top.bg"
! 			set topimg [image create photo [TmpImgName]] ;#gets destroyed
  			$topimg copy [::skin::loadPixmap cwtopback]
  			::picture::Colorize $topimg [::skin::getKey topbarbg]

Index: balloon.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/balloon.tcl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** balloon.tcl	13 Apr 2006 10:20:17 -0000	1.39
--- balloon.tcl	19 Apr 2006 13:20:21 -0000	1.40
***************
*** 57,60 ****
--- 57,62 ----
      set BullePic(${target}) ${pic}
      bindtags ${target} "[bindtags ${target}] Bulle"
+     bind $target <Destroy> "array unset Bulle ${target}; array unset BullePic ${target}"
+     
  }
  

Index: picture.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/picture.tcl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** picture.tcl	12 Apr 2006 08:51:02 -0000	1.22
--- picture.tcl	19 Apr 2006 13:20:21 -0000	1.23
***************
*** 80,85 ****
  			#TkCximage
  			if { [catch { 
! 				set photo [image create photo -file $original -format cximage] ;#gets destroyed
! 				::CxImage::Resize $photo $width $height 
  				$photo write $destination 
  				image delete $photo
--- 80,85 ----
  			#TkCximage
  			if { [catch { 
! 				set photo [image create photo [TmpImgName] -file $original -format cximage] ;#gets destroyed
! 				::picture::ResizeWithRatio $photo $width $height 
  				$photo write $destination 
  				image delete $photo
***************
*** 123,127 ****
  		
  		if {[::picture::Loaded]} {
! 			set temp [image create photo] ;#gets destroyed
  			if { [catch {$temp copy $photo -from $x1 $y1 $x2 $y2} res] != 0 } {
  				image delete $temp
--- 123,127 ----
  		
  		if {[::picture::Loaded]} {
! 			set temp [image create photo [TmpImgName]] ;#gets destroyed
  			if { [catch {$temp copy $photo -from $x1 $y1 $x2 $y2} res] != 0 } {
  				image delete $temp
***************
*** 230,234 ****
  		}
  		
! 		if {[catch {set img [image create photo -file $filename -format cximage]} res]} {
  			status_log "Picture.tcl::GetPictureSize: $res\n" red
  			error "$res"
--- 230,234 ----
  		}
  		
! 		if {[catch {set img [image create photo [TmpImgName] -file $filename -format cximage]} res]} {
  			status_log "Picture.tcl::GetPictureSize: $res\n" red
  			error "$res"

Index: gui.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/gui.tcl,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -C2 -d -r1.1280 -r1.1281
*** gui.tcl	18 Apr 2006 17:18:23 -0000	1.1280
--- gui.tcl	19 Apr 2006 13:20:19 -0000	1.1281
***************
*** 733,737 ****
  		#Draw our own message
  		#Does this image ever gets destroyed ? When destroying the chatwindow it's embeddeed in it should I guess ? This is not the leak I'm searching for though as I'm not sending inks...
! 		set img [image create photo -file $filename]
  		SendMessageFIFO [list ::amsn::ShowInk $chatid [::abook::getPersonal login] $nick $img ink $p4c] "::amsn::messages_stack($chatid)" "::amsn::messages_flushing($chatid)"
  		::MSN::ChatQueue $chatid [list ::MSN::SendInk $chatid $filename]
--- 733,737 ----
  		#Draw our own message
  		#Does this image ever gets destroyed ? When destroying the chatwindow it's embeddeed in it should I guess ? This is not the leak I'm searching for though as I'm not sending inks...
! 		set img [image create photo [TmpImgName] -file $filename]
  		SendMessageFIFO [list ::amsn::ShowInk $chatid [::abook::getPersonal login] $nick $img ink $p4c] "::amsn::messages_stack($chatid)" "::amsn::messages_flushing($chatid)"
  		::MSN::ChatQueue $chatid [list ::MSN::SendInk $chatid $filename]
***************
*** 6853,6856 ****
--- 6853,6857 ----
  proc status_log {txt {colour ""}} {
  	global followtext_status queued_status
+ #	return
  
  	#ensure txt ends in a newline
***************
*** 7402,7406 ****
  	
  		#Create img from the file
! 		if {[catch {set img [image create photo -file $filename -format cximage]} res]} {
  			#If there's an error, it means the filename is corrupted, remove it
  			catch { file delete $filename }
--- 7403,7407 ----
  	
  		#Create img from the file
! 		if {[catch {set img [image create photo [TmpImgName] -file $filename -format cximage]} res]} {
  			#If there's an error, it means the filename is corrupted, remove it
  			catch { file delete $filename }
***************
*** 7761,7765 ****
  		set skin_file "[::skin::GetSkinFile displaypic [file tail $filename]]"
  		if { [file exists $skin_file] } {
! 			#set the_image [image create photo -file $skin_file ]
  			#addPicture $the_image "[getPictureDesc $filename]" [file tail $filename]
  			#lappend image_names $the_image
--- 7762,7766 ----
  		set skin_file "[::skin::GetSkinFile displaypic [file tail $filename]]"
  		if { [file exists $skin_file] } {
! 			#set the_image [image create photo [TmpImgName] -file $skin_file ]
  			#addPicture $the_image "[getPictureDesc $filename]" [file tail $filename]
  			#lappend image_names $the_image
***************
*** 7772,7776 ****
  	foreach filename [lsort -dictionary $myfiles] {
  		if { [file exists $filename] } {
! 			#set the_image [image create photo -file "[filenoext $filename].gif" ]
  			#addPicture $the_image "[getPictureDesc $filename]" [file tail $filename]
  			#lappend image_names $the_image
--- 7773,7777 ----
  	foreach filename [lsort -dictionary $myfiles] {
  		if { [file exists $filename] } {
! 			#set the_image [image create photo [TmpImgName] -file "[filenoext $filename].gif" ]
  			#addPicture $the_image "[getPictureDesc $filename]" [file tail $filename]
  			#lappend image_names $the_image
***************
*** 7790,7794 ****
  		foreach filename $cachefiles {
  			if { [file exists $filename] } {
! 				#set the_image [image create photo -file "[filenoext $filename].gif" ]
  				#addPicture $the_image "[getPictureDesc $filename]" "cache/[file tail $filename]"
  				#lappend image_names $the_image
--- 7791,7795 ----
  		foreach filename $cachefiles {
  			if { [file exists $filename] } {
! 				#set the_image [image create photo [TmpImgName] -file "[filenoext $filename].gif" ]
  				#addPicture $the_image "[getPictureDesc $filename]" "cache/[file tail $filename]"
  				#lappend image_names $the_image
***************
*** 7807,7811 ****
  			set filename [lindex $file 1]
  			
! 			if {[catch {set the_image [image create photo -file $filename -format cximage]} res]} {
  				#If there's an error, it means the filename is corrupted, remove it
  				catch { file delete $filename }
--- 7808,7812 ----
  			set filename [lindex $file 1]
  			
! 			if {[catch {set the_image [image create photo [TmpImgName] -file $filename -format cximage]} res]} {
  				#If there's an error, it means the filename is corrupted, remove it
  				catch { file delete $filename }
***************
*** 7929,7933 ****
  			}
  
! 			set image_name [image create photo -file [::skin::GetSkinFile "displaypic" "[filenoext [file tail $file]].png"] -format cximage]
  			status_log $image_name red
  			.picbrowser.mypic configure -image $image_name
--- 7930,7934 ----
  			}
  
! 			set image_name [image create photo [TmpImgName] -file [::skin::GetSkinFile "displaypic" "[filenoext [file tail $file]].png"] -format cximage]
  			status_log $image_name red
  			.picbrowser.mypic configure -image $image_name
***************
*** 8043,8049 ****
  proc degt_protocol { str {colour ""}} {
  	global followtext_degt
! 
  	.degt.mid.txt insert end "[timestamp] $str\n" $colour
- #	puts "$str"
  	.degt.mid.txt delete 0.0 end-1000lines
  	if { $followtext_degt == 1} {
--- 8044,8049 ----
  proc degt_protocol { str {colour ""}} {
  	global followtext_degt
! #	return
  	.degt.mid.txt insert end "[timestamp] $str\n" $colour
  	.degt.mid.txt delete 0.0 end-1000lines
  	if { $followtext_degt == 1} {
***************
*** 8401,8402 ****
--- 8401,8412 ----
  }
  
+ proc TmpImgName {} {
+ 	set idx 0
+ 	while {[ImageExists tmp$idx]} {
+ 		incr idx
+ 	}
+ 	return tmp$idx
+ }
+ 
+ 
+ 

Index: msncam.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/msncam.tcl,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** msncam.tcl	19 Apr 2006 09:27:37 -0000	1.148
--- msncam.tcl	19 Apr 2006 13:20:21 -0000	1.149
***************
*** 1503,1507 ****
  			wm title $window "$chatid - [::abook::getDisplayNick $chatid]"
  			wm protocol $window WM_DELETE_WINDOW "::MSNCAM::CancelCam $chatid $sid"
! 			set img [image create photo]
  			label $window.l -image $img
  			pack $window.l
--- 1503,1507 ----
  			wm title $window "$chatid - [::abook::getDisplayNick $chatid]"
  			wm protocol $window WM_DELETE_WINDOW "::MSNCAM::CancelCam $chatid $sid"
! 			set img [image create photo [TmpImgName]]
  			label $window.l -image $img
  			pack $window.l
***************
*** 1642,1646 ****
  			#Don't show the sending frame on Mac OS X (we already have the grabber)
  			if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} {
! 				set img [image create photo]
  				set w .grabber
  
--- 1642,1646 ----
  			#Don't show the sending frame on Mac OS X (we already have the grabber)
  			if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} {
! 				set img [image create photo [TmpImgName]]
  				set w .grabber
  
***************
*** 1661,1665 ****
  
  			} else {
! 				set img [image create photo]
  				toplevel $window
  				wm title $window "$chatid - [::abook::getDisplayNick $chatid]"
--- 1661,1665 ----
  
  			} else {
! 				set img [image create photo [TmpImgName]]
  				toplevel $window
  				wm title $window "$chatid - [::abook::getDisplayNick $chatid]"
***************
*** 2349,2353 ****
  		label $status -text "[trans choosedevice]"
  
! 		set img [image create photo]
  		label $preview -image $img
  		button $settings -text "[trans changevideosettings]"
--- 2349,2353 ----
  		label $status -text "[trans choosedevice]"
  
! 		set img [image create photo [TmpImgName]]
  		label $preview -image $img
  		button $settings -text "[trans changevideosettings]"
***************
*** 2628,2632 ****
  
  		if { $img == "" } {
! 			set img [image create photo]
  		}
  		label $preview -image $img
--- 2628,2632 ----
  
  		if { $img == "" } {
! 			set img [image create photo [TmpImgName]]
  		}
  		label $preview -image $img
***************
*** 2750,2754 ****
  		label $status -text "[trans choosedevice]"
  
! 		set img [image create photo]
  		label $preview -image $img
  		button $settings -text "[trans changevideosettings]" -command "::CAMGUI::Choose_SettingsWindows $devs.list"
--- 2750,2754 ----
  		label $status -text "[trans choosedevice]"
  
! 		set img [image create photo [TmpImgName]]
  		label $preview -image $img
  		button $settings -text "[trans changevideosettings]" -command "::CAMGUI::Choose_SettingsWindows $devs.list"
***************
*** 3451,3455 ****
  			}
  
! 			set previmg [image create photo]
  
  					
--- 3451,3455 ----
  			}
  
! 			set previmg [image create photo [TmpImgName]]
  
  					
***************
*** 3638,3642 ****
  		}
  
! 		set previmg [image create photo]
  
  					
--- 3638,3642 ----
  		}
  
! 		set previmg [image create photo [TmpImgName]]
  
  					

Index: protocol.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/protocol.tcl,v
retrieving revision 1.812
retrieving revision 1.813
diff -C2 -d -r1.812 -r1.813
*** protocol.tcl	18 Apr 2006 23:11:27 -0000	1.812
--- protocol.tcl	19 Apr 2006 13:20:21 -0000	1.813
***************
*** 3649,3653 ****
  					set data $body
  				}
! 				set img [image create photo -data $data]
  
  				SendMessageFIFO [list ::amsn::ShowInk $chatid $typer $nick $img ink $p4c_enabled] "::amsn::messages_stack($chatid)" "::amsn::messages_flushing($chatid)"
--- 3649,3653 ----
  					set data $body
  				}
! 				set img [image create photo [TmpImgName] -data $data]
  
  				SendMessageFIFO [list ::amsn::ShowInk $chatid $typer $nick $img ink $p4c_enabled] "::amsn::messages_stack($chatid)" "::amsn::messages_flushing($chatid)"
***************
*** 5990,5994 ****
  			#Here we resize the picture and save it in /FT/cache for the preview (we send it and we see it)
  			create_dir [file join [set ::HOME] FT cache]
! 			if {[catch {set image [image create photo -file $filename]}]} {
  				set image [::skin::getNoDisplayPicture]
  			}
--- 5990,5994 ----
  			#Here we resize the picture and save it in /FT/cache for the preview (we send it and we see it)
  			create_dir [file join [set ::HOME] FT cache]
! 			if {[catch {set image [image create photo [TmpImgName] -file $filename]}]} {
  				set image [::skin::getNoDisplayPicture]
  			}
***************
*** 6629,6633 ****
  			close $fd
  			set file [file join $dir ${sid}.png]
! 			if { $file != "" && ![catch {set img [image create photo -file $file]} res]} {
  				::skin::setPixmap FT_preview_${sid} "[file join $dir ${sid}.png]"			
  			}
--- 6629,6633 ----
  			close $fd
  			set file [file join $dir ${sid}.png]
! 			if { $file != "" && ![catch {set img [image create photo [TmpImgName] -file $file]} res]} {
  				::skin::setPixmap FT_preview_${sid} "[file join $dir ${sid}.png]"			
  			}

Index: plugins.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/plugins.tcl,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** plugins.tcl	18 Apr 2006 17:34:11 -0000	1.137
--- plugins.tcl	19 Apr 2006 13:20:21 -0000	1.138
***************
*** 6,9 ****
--- 6,10 ----
  
  proc plugins_log {plugin msg} {
+ #return
  	if {[info procs "::pluginslog::plugins_log"] == "::pluginslog::plugins_log"} {
  		::pluginslog::plugins_log $plugin $msg

Index: msnp2p.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/msnp2p.tcl,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** msnp2p.tcl	18 Apr 2006 20:37:24 -0000	1.59
--- msnp2p.tcl	19 Apr 2006 13:20:21 -0000	1.60
***************
*** 1006,1010 ****
  						set data $body
  					}
! 					set img [image create photo -data $data]
  					set user [lindex [::MSN::usersInChat $chatid] 0]
  					set nick [::abook::getDisplayNick $user]
--- 1006,1010 ----
  						set data $body
  					}
! 					set img [image create photo [TmpImgName] -data $data]
  					set user [lindex [::MSN::usersInChat $chatid] 0]
  					set nick [::abook::getDisplayNick $user]