oh lol
I have forgotten the diff file :-S
^__^''
Index: gui.tcl
===================================================================
--- gui.tcl (revisione 7939)
+++ gui.tcl (copia locale)
@@ -6993,8 +6993,7 @@
proc MessageSendCallback { chatid error } {
if {![string match *success* $error]} {
- ::amsn::WinWrite $chatid "\n[timestamp] [trans deliverfail]:\n" red
- ::amsn::WinWrite $chatid "\n$error\n" red
+ ::amsn::WinWriteFail $chatid "($error)"
}
}
@@ -7013,8 +7012,8 @@
if { $answer == "yes"} {
set ::OIM_GUI::oim_asksend_[string map {: _} ${chatid} ] 0
::MSNOIM::sendOIMMessage [list ::OIM_GUI::MessageSendCallback $chatid] $email $txt
- #loging
- if {[::config::getKey keep_logs]} {
+ #loging, we have to add && [::abook::getPersonal MFN] == $email because without this we log also unuseful things.
+ if {[::config::getKey keep_logs] && [::abook::getPersonal MFN] == $email} {
::log::PutLog $chatid $email $txt
}
}
@@ -7148,7 +7147,10 @@
#We should add an event for sending message
#loging
if {[::config::getKey keep_logs]} {
- ::log::PutLog $chatid $user $msg
+ #we need to reset them
+ set msg [lindex $oim_message 3]
+ set user $nick
+ ::log::PutLog $chatid $user $msg "" 0 $tstamp
}
}
Index: loging.tcl
===================================================================
--- loging.tcl (revisione 7939)
+++ loging.tcl (copia locale)
@@ -262,7 +262,8 @@
# user : user who sent message
# msg : msg
- proc PutLog { chatid user msg {fontformat ""} {failed 0}} {
+ proc PutLog { chatid user msg {fontformat ""} {failed 0} {OIMtstamp 0}} {
+ plugins_log OIMtstamp1 "$OIMtstamp"
if {$fontformat == ""} {
set color "NOR"
} else {
@@ -275,8 +276,9 @@
set user [trans deliverfail]
}
- if {[::OIM_GUI::IsOIM $chatid]} {
- ::log::WriteLog $chatid "\|\"LITA$user :\|\"L$color $msg\n" 0 $chatid
+ #if we are sending or receiving an OIM...
+ if {[::OIM_GUI::IsOIM $chatid] || $OIMtstamp != 0} {
+ ::log::WriteLog $chatid "\|\"LITA$user :\|\"L$color $msg\n" 0 $chatid $OIMtstamp
} else {
set user_list [::MSN::usersInChat $chatid]
foreach user_info $user_list {
@@ -303,8 +305,7 @@
# Checks if a fileid for current user already exists before writing
# conf 1 is used for conference messages
- proc WriteLog { email txt {conf 0} {user_list ""}} {
-
+ proc WriteLog { email txt {conf 0} {user_list ""} {OIMtstamp 0}} {
set fileid [LogArray $email get]
ConfArray $email newset $conf
@@ -328,17 +329,27 @@
ConfArray $email set $conf
}
}
- puts -nonewline $fileid "\|\"LGRA[timestamp] $txt"
+ if {$OIMtstamp != 0 } {
+ puts -nonewline $fileid "\|\"LGRA$OIMtstamp $txt"
+ } else {
+ puts -nonewline $fileid "\|\"LGRA[timestamp] $txt"
+ }
} else {
StartLog $email
set fileid [LogArray $email get]
if { $fileid != 0 } {
- if { $conf == 0 } {
+ if {[::OIM_GUI::IsOIM $email] || $OIMtstamp != 0} {
+ puts -nonewline $fileid "\|\"LRED\[[trans lconvstartedOIM [clock format [clock seconds] -format "%d %b %Y %T"]]\]\n"
+ } elseif { $conf == 0 } {
puts -nonewline $fileid "\|\"LRED\[[trans lconvstarted [clock format [clock seconds] -format "%d %b %Y %T"]]\]\n"
} else {
puts -nonewline $fileid "\|\"LRED\[[trans lenteredconf $email [clock format [clock seconds] -format "%d %b %Y %T"]] \(${users}\) \]\n"
}
- puts -nonewline $fileid "\|\"LGRA[timestamp] $txt"
+ if {$OIMtstamp != 0 } {
+ puts -nonewline $fileid "\|\"LGRA$OIMtstamp $txt"
+ } else {
+ puts -nonewline $fileid "\|\"LGRA[timestamp] $txt"
+ }
}
}
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Amsn-devel mailing list
Amsn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amsn-devel
