From: <ba...@us...> - 2008-02-18 10:16:07
|
Revision: 9579 http://amsn.svn.sourceforge.net/amsn/?rev=9579&view=rev Author: baaazen Date: 2008-02-18 02:16:08 -0800 (Mon, 18 Feb 2008) Log Message: ----------- the modifying custom emoticon dialog showed relative path instead of absolute path, so modifying emoticons failed -> fixed sound files are now saved with relative path, too Modified Paths: -------------- trunk/amsn/config.tcl trunk/amsn/smileys.tcl Modified: trunk/amsn/config.tcl =================================================================== --- trunk/amsn/config.tcl 2008-02-17 21:36:31 UTC (rev 9578) +++ trunk/amsn/config.tcl 2008-02-18 10:16:08 UTC (rev 9579) @@ -611,7 +611,7 @@ foreach attribute [array names emotion] { set tmp_value $emotion($attribute) #Convert absolute paths to subdirs in the profile-home to relative paths - if { $attribute == "file" } { + if { $attribute == "file" || $attribute == "sound" } { set tmp_value [PathAbsToRel $tmp_value] } Modified: trunk/amsn/smileys.tcl =================================================================== --- trunk/amsn/smileys.tcl 2008-02-17 21:36:31 UTC (rev 9578) +++ trunk/amsn/smileys.tcl 2008-02-18 10:16:08 UTC (rev 9579) @@ -315,7 +315,7 @@ set animated [expr {[info exists emotion(animated)] && [is_true $emotion(animated)]}] if { $contact_list == 0 && [info exists emotion(sound)] && $emotion(sound) != "" } { - set sound $emotion(sound) + set sound [PathRelToAbs $emotion(sound)] } else { set sound "" } set image_name $emotion(image_name) set image_file [PathRelToAbs $emotion(file)] @@ -558,7 +558,7 @@ set animated [expr {[info exists emotion(animated)] && [is_true $emotion(animated)]}] if { $contact_list == 0 && [info exists emotion(sound)] && $emotion(sound) != "" } { - set sound $emotion(sound) + set sound [PathRelToAbs $emotion(sound)] } else { set sound "" } @@ -936,7 +936,12 @@ foreach element [list name file animated sound casesensitive] { if {[info exists emotion($element)]} { - set new_custom_cfg($element) $emotion($element) + if {$element == "file" || $element == "sound"} { + #restore absolute path + set new_custom_cfg($element) [PathRelToAbs $emotion($element)] + } else { + set new_custom_cfg($element) $emotion($element) + } } else { set new_custom_cfg($element) "" } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |