From: <vi...@us...> - 2008-11-30 15:52:16
|
Revision: 10780 http://amsn.svn.sourceforge.net/amsn/?rev=10780&view=rev Author: vivia Date: 2008-11-30 15:51:07 +0000 (Sun, 30 Nov 2008) Log Message: ----------- Properly display the other person s nick or email address without machine guid when FT-ing Modified Paths: -------------- trunk/amsn/gui.tcl Modified: trunk/amsn/gui.tcl =================================================================== --- trunk/amsn/gui.tcl 2008-11-30 12:56:59 UTC (rev 10779) +++ trunk/amsn/gui.tcl 2008-11-30 15:51:07 UTC (rev 10780) @@ -1181,6 +1181,11 @@ return 0 } + set semic [string first ";" $dest] + if { $semic > 0 } { + set dest [string range $dest 0 [expr {$semic - 1}]] + } + 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] @@ -1224,6 +1229,11 @@ return 0 } + set semic [string first ";" $fromlogin] + if { $semic > 0 } { + set fromlogin [string range $fromlogin 0 [expr {$semic - 1}]] + } + set fromname [::abook::getDisplayNick $fromlogin] set txt [trans ftgotinvitation $fromname '$filename' [::amsn::sizeconvert $filesize] [::config::getKey receiveddir]] @@ -9009,4 +9019,4 @@ if {[OnMac] } { buttons2labels } -} \ No newline at end of file +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |