[Amsn-commits] msn amsn,1.401,1.402 autoupdate.tcl,1.33,1.34 chatwindow.tcl,1.207,1.208 config.tcl,1.312,1.313 gui.tcl,1.1194,1.1195 protocol.tcl,1.760,1.761

[Vivia N. <vi...@us...>]

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

Modified Files:
	amsn autoupdate.tcl chatwindow.tcl config.tcl gui.tcl 
	protocol.tcl 
Log Message:
files_dir as a global variable caused problems when switching profiles, replaced with ::config::getKey receiveddir

Index: amsn
===================================================================
RCS file: /cvsroot/amsn/msn/amsn,v
retrieving revision 1.401
retrieving revision 1.402
diff -C2 -d -r1.401 -r1.402
*** amsn	31 Dec 2005 06:45:27 -0000	1.401
--- amsn	19 Jan 2006 13:36:00 -0000	1.402
***************
*** 57,61 ****
  set HOME ""
  set HOME2 ""
- set files_dir ""
  
  #=======================================================================
--- 57,60 ----
***************
*** 95,113 ****
  if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} {
  	set HOME "[file join $env(HOME) Library/Application\ Support/amsn]"
- 	set files_dir "[file join $env(HOME) Desktop/amsn\ received\ files]"
  } elseif {$tcl_platform(platform) == "unix"} {
     set HOME "[file join $env(HOME) .amsn]"
-    set files_dir "[file join $env(HOME) amsn_received]"
  } elseif {$tcl_platform(platform) == "windows"} {
    if {[info exists env(USERPROFILE)]} {
       set HOME "[file join $env(USERPROFILE) amsn]"
-      set files_dir "[file join $env(USERPROFILE) amsn_received]"
    } else {
     set HOME "[file join [pwd] amsn_config]"
-    set files_dir "[file join [pwd] amsn_received]"
    }
  } else {
     set HOME "[file join [pwd] amsn_config]"
-    set files_dir "[file join [pwd] amsn_received]"
  }
  set HOME2 $HOME
--- 94,107 ----
***************
*** 265,280 ****
  }
  
- if { [::config::getKey receiveddir] != "" } {
-    set res [create_dir [::config::getKey receiveddir]]
-    if { $res >= 0} {
-       set files_dir [::config::getKey receiveddir]
-    } else {
-       create_dir $files_dir
-    }
- } else {
- 	::config::setKey receiveddir $files_dir
- 	create_dir $files_dir
- }
- 
  cmsn_draw_main
  
--- 259,262 ----

Index: chatwindow.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/chatwindow.tcl,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** chatwindow.tcl	18 Jan 2006 16:32:31 -0000	1.207
--- chatwindow.tcl	19 Jan 2006 13:36:00 -0000	1.208
***************
*** 1196,1201 ****
  	#
  	proc CreateMsnMenu { w menu } {
- 		global files_dir
- 
  		set msnmenu $menu.msn
  		menu $msnmenu -tearoff 0 -type normal
--- 1196,1199 ----
***************
*** 1207,1211 ****
  			-command "::amsn::FileTransferSend \[::ChatWindow::getCurrentTab $w\]"
  		$msnmenu add command -label "[trans openreceived]..." \
! 			-command "launch_filemanager \"$files_dir\""
  		$msnmenu add separator
  		
--- 1205,1209 ----
  			-command "::amsn::FileTransferSend \[::ChatWindow::getCurrentTab $w\]"
  		$msnmenu add command -label "[trans openreceived]..." \
! 			-command "launch_filemanager \"[::config::getKey receiveddir]\""
  		$msnmenu add separator
  		

Index: autoupdate.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/autoupdate.tcl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** autoupdate.tcl	18 Nov 2005 03:07:55 -0000	1.33
--- autoupdate.tcl	19 Jan 2006 13:36:00 -0000	1.34
***************
*** 160,164 ****
  
  	proc downloadTLSCompleted { downloadurl token } {
! 		global files_dir HOME2 tlsplatform
  
  		status_log "status: [http::status $token]\n"
--- 160,164 ----
  
  	proc downloadTLSCompleted { downloadurl token } {
! 		global HOME2 tlsplatform
  
  		status_log "status: [http::status $token]\n"
***************
*** 190,194 ****
  			"win32" {
  				if { [catch {
! 					set file_id [open [file join $files_dir $fname] w]
  					fconfigure $file_id -translation {binary binary} -encoding binary
  					puts -nonewline $file_id [::http::data $token]
--- 190,194 ----
  			"win32" {
  				if { [catch {
! 					set file_id [open [file join [::config::getKey receiveddir] $fname] w]
  					fconfigure $file_id -translation {binary binary} -encoding binary
  					puts -nonewline $file_id [::http::data $token]
***************
*** 199,205 ****
  
  					if { $tlsplatform == "win32" } {
! 						exec [file join $files_dir $fname] "x" "-o" "-y"
  					} else {
! 						exec gzip -cd [file join $files_dir $fname] | tar xvf -
  					}
  					cd $olddir
--- 199,205 ----
  
  					if { $tlsplatform == "win32" } {
! 						exec [file join [::config::getKey receiveddir] $fname] "x" "-o" "-y"
  					} else {
! 						exec gzip -cd [file join [::config::getKey receiveddir] $fname] | tar xvf -
  					}
  					cd $olddir
***************
*** 212,220 ****
  			"src" {
  			if { [catch {
! 					set file_id [open [file join $files_dir $fname] w]
  					fconfigure $file_id -translation {binary binary} -encoding binary
  					puts -nonewline $file_id [::http::data $token]
  					close $file_id
! 					::amsn::infoMsg "[trans tlsdowncompleted $fname $files_dir [file join $HOME2 plugins]]"
  				} res ] } {
  					::autoupdate::errorDownloadingTLS $res
--- 212,220 ----
  			"src" {
  			if { [catch {
! 					set file_id [open [file join [::config::getKey receiveddir] $fname] w]
  					fconfigure $file_id -translation {binary binary} -encoding binary
  					puts -nonewline $file_id [::http::data $token]
  					close $file_id
! 					::amsn::infoMsg "[trans tlsdowncompleted $fname [::config::getKey receiveddir] [file join $HOME2 plugins]]"
  				} res ] } {
  					::autoupdate::errorDownloadingTLS $res
***************
*** 222,226 ****
  			}
  			default {
! 				::amsn::infoMsg "[trans tlsdowncompleted $fname $files_dir [file join $HOME2 plugins]]"
  			}
  		}
--- 222,226 ----
  			}
  			default {
! 				::amsn::infoMsg "[trans tlsdowncompleted $fname [::config::getKey receiveddir] [file join $HOME2 plugins]]"
  			}
  		}
***************
*** 448,452 ****
  		} elseif { $::tcl_platform(platform)=="windows" } {
  			set namelocation "Received files folder"
! 			set defaultlocation "$files_dir"
  		} else { 
  			set namelocation "Home folder"
--- 448,452 ----
  		} elseif { $::tcl_platform(platform)=="windows" } {
  			set namelocation "Received files folder"
! 			set defaultlocation "[::config::getKey receiveddir]"
  		} else { 
  			set namelocation "Home folder"

Index: gui.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/gui.tcl,v
retrieving revision 1.1194
retrieving revision 1.1195
diff -C2 -d -r1.1194 -r1.1195
*** gui.tcl	18 Jan 2006 16:32:31 -0000	1.1194
--- gui.tcl	19 Jan 2006 13:36:00 -0000	1.1195
***************
*** 948,953 ****
  	#  This procedure is called when we receive an MSN6 File Transfer Request
  	proc GotFileTransferRequest { chatid dest branchuid cseq uid sid filename filesize} {
- 		global files_dir
- 
  		set win_name [::ChatWindow::For $chatid]
  
--- 948,951 ----
***************
*** 957,961 ****
  
  		set fromname [::abook::getDisplayNick $dest]
! 		set txt [trans ftgotinvitation $fromname '$filename' [::amsn::sizeconvert $filesize] $files_dir]
  		set win_name [::ChatWindow::MakeFor $chatid $txt $dest]
  		WinWrite $chatid "\n" green
--- 955,959 ----
  
  		set fromname [::abook::getDisplayNick $dest]
! 		set txt [trans ftgotinvitation $fromname '$filename' [::amsn::sizeconvert $filesize] [::config::getKey receiveddir]]
  		set win_name [::ChatWindow::MakeFor $chatid $txt $dest]
  		WinWrite $chatid "\n" green
***************
*** 982,987 ****
  		::log::ftlog $dest $txt
  
! 		if { ![file writable $files_dir]} {
! 			WinWrite $chatid "\n[trans readonlywarn $files_dir]\n" red
  			WinWriteIcon $chatid greyline 3
  			}
--- 980,985 ----
  		::log::ftlog $dest $txt
  
! 		if { ![file writable [::config::getKey receiveddir]]} {
! 			WinWrite $chatid "\n[trans readonlywarn [::config::getKey receiveddir]]\n" red
  			WinWriteIcon $chatid greyline 3
  			}
***************
*** 995,1000 ****
  	#Message shown when receiving a file
  	proc fileTransferRecv {filename filesize cookie chatid fromlogin} {
- 		global files_dir
- 
  		set win_name [::ChatWindow::For $chatid]
  		if { [::ChatWindow::For $chatid] == 0} {
--- 993,996 ----
***************
*** 1003,1007 ****
  
  		set fromname [::abook::getDisplayNick $fromlogin]
! 		set txt [trans ftgotinvitation $fromname '$filename' [::amsn::sizeconvert $filesize] $files_dir]
  
  		set win_name [::ChatWindow::MakeFor $chatid $txt $fromlogin]
--- 999,1003 ----
  
  		set fromname [::abook::getDisplayNick $fromlogin]
! 		set txt [trans ftgotinvitation $fromname '$filename' [::amsn::sizeconvert $filesize] [::config::getKey receiveddir]]
  
  		set win_name [::ChatWindow::MakeFor $chatid $txt $fromlogin]
***************
*** 1027,1032 ****
  		::log::ftlog $fromlogin $txt
  
! 		if { ![file writable $files_dir]} {
! 			WinWrite $chatid "\n[trans readonlywarn $files_dir]\n" red
  			WinWriteIcon $chatid greyline 3
  		}
--- 1023,1028 ----
  		::log::ftlog $fromlogin $txt
  
! 		if { ![file writable [::config::getKey receiveddir]]} {
! 			WinWrite $chatid "\n[trans readonlywarn [::config::getKey receiveddir]]\n" red
  			WinWriteIcon $chatid greyline 3
  		}
***************
*** 1173,1177 ****
  	#PRIVATE: Opens Receiving Window
  	proc FTWin {cookie filename user {chatid 0}} {
- 		global files_dir
  		status_log "Creating receive progress window\n"
  
--- 1169,1172 ----
***************
*** 1205,1209 ****
  		pack $w.ftautoclose -side top
  		#Specify the path to the file
! 		set filepath [file join $files_dir $filename]
  		set filedir [file dirname $filepath]
  
--- 1200,1204 ----
  		pack $w.ftautoclose -side top
  		#Specify the path to the file
! 		set filepath [file join [::config::getKey receiveddir] $filename]
  		set filedir [file dirname $filepath]
  
***************
*** 3299,3303 ****
  	.main_menu.file add command -label "[trans sendfile]..." -state disabled
  	.main_menu.file add command -label "[trans openreceived]" \
! 		-command "launch_filemanager \"$files_dir\""
  	.main_menu.file add separator
  	.main_menu.file add command -label "[trans close]" -command "close_cleanup;exit"
--- 3294,3298 ----
  	.main_menu.file add command -label "[trans sendfile]..." -state disabled
  	.main_menu.file add command -label "[trans openreceived]" \
! 		-command "launch_filemanager \"[::config::getKey receiveddir]\""
  	.main_menu.file add separator
  	.main_menu.file add command -label "[trans close]" -command "close_cleanup;exit"

Index: protocol.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/protocol.tcl,v
retrieving revision 1.760
retrieving revision 1.761
diff -C2 -d -r1.760 -r1.761
*** protocol.tcl	17 Jan 2006 16:30:01 -0000	1.760
--- protocol.tcl	19 Jan 2006 13:36:00 -0000	1.761
***************
*** 252,256 ****
  
     proc ConnectedMSNFTP {sockid authcookie cookie} {
-       global files_dir
        variable filedata
  
--- 252,255 ----
***************
*** 284,288 ****
  
     proc FTNegotiation { sockid cookie state {authcookie ""}} {
-       global files_dir
        variable filedata
  
--- 283,286 ----
***************
*** 338,342 ****
                status_log "Receiving file...\n"
  
!               set filename [file join ${files_dir} [lindex $filedata($cookie) 0]]
  	      set origfile $filename
  
--- 336,340 ----
                status_log "Receiving file...\n"
  
!               set filename [file join [::config::getKey receiveddir] [lindex $filedata($cookie) 0]]
  	      set origfile $filename
  
***************
*** 607,611 ****
  
     proc FTSendNegotiation { sockid cookie state {authcookie ""}} {
-       global files_dir
        variable filedata
  
--- 605,608 ----
***************
*** 6485,6492 ****
  	# This function is called when a file transfer is accepted by the user
  	proc AcceptFT { chatid dest branchuid cseq uid sid filename1 } {
- 		global files_dir
- 
  		# Let's open the file
! 		set filename [file join ${files_dir} $filename1]
  
  		set origfile $filename
--- 6482,6487 ----
  	# This function is called when a file transfer is accepted by the user
  	proc AcceptFT { chatid dest branchuid cseq uid sid filename1 } {
  		# Let's open the file
! 		set filename [file join [::config::getKey receiveddir] $filename1]
  
  		set origfile $filename

Index: config.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/config.tcl,v
retrieving revision 1.312
retrieving revision 1.313
diff -C2 -d -r1.312 -r1.313
*** config.tcl	18 Jan 2006 13:13:32 -0000	1.312
--- config.tcl	19 Jan 2006 13:36:00 -0000	1.313
***************
*** 46,49 ****
--- 46,64 ----
  		::config::setKey autoresizedp 0
  
+ 		#Dir for received files
+ 		if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} {
+ 		        ::config::setKey receiveddir "[file join $::env(HOME) Desktop/amsn\ received\ files]"
+ 		} elseif {$tcl_platform(platform) == "unix"} {
+ 			::config::setKey receiveddir "[file join $::env(HOME) amsn_received]"
+ 		} elseif {$tcl_platform(platform) == "windows"} {
+ 			if {[info exists env(USERPROFILE)]} {
+ 				::config::setKey receiveddir "[file join $::env(USERPROFILE) amsn_received]"
+ 			} else {
+ 				::config::setKey receiveddir "[file join [pwd] amsn_received]"
+ 			}
+ 		} else {
+ 			::config::setKey receiveddir "[file join [pwd] amsn_received]"
+ 		}
+ 
  		#Some Autodetected options
  		if {$tcl_platform(os) == "Darwin"} {