[Amsn-commits] SF.net SVN: amsn: [9068] trunk/amsn

[<air...@us...>]

Revision: 9068
          http://amsn.svn.sourceforge.net/amsn/?rev=9068&view=rev
Author:   airadier
Date:     2007-10-15 13:17:15 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
FIXED: When sending a message to an user not in contact list, if the user was offline, then status was cached and never checked again. Only way to send a message was adding to contact list, or loging out and in again.
MessageTo was refactores to queue message if this is not sent as an offline message. Also, try to send typing notification, as this tries to reconnect to SB and re-checks user status.

Modified Paths:
--------------
    trunk/amsn/gui.tcl
    trunk/amsn/protocol.tcl

Modified: trunk/amsn/gui.tcl
===================================================================
--- trunk/amsn/gui.tcl	2007-10-10 16:24:54 UTC (rev 9067)
+++ trunk/amsn/gui.tcl	2007-10-15 20:17:15 UTC (rev 9068)
@@ -2525,9 +2525,12 @@
 			return 0
 		}
 		#no typing notification for OIM
-		if {[::OIM_GUI::IsOIM $chatid] == 1 } {
-			return 0
-		}
+		#AIM: Try to send it, so status is rechecked
+		#TODO: Maybe should try to send it only for users 
+		#not in contact list
+		#if {[::OIM_GUI::IsOIM $chatid] == 1 } {
+		#	return 0
+		#}
 
 
 		#Don't queue unless chat is ready, but try to reconnect

Modified: trunk/amsn/protocol.tcl
===================================================================
--- trunk/amsn/protocol.tcl	2007-10-10 16:24:54 UTC (rev 9067)
+++ trunk/amsn/protocol.tcl	2007-10-15 20:17:15 UTC (rev 9068)
@@ -2687,21 +2687,15 @@
 		    ::MSNMobile::MessageSend $chatid $txt
 		    return 0
 		} elseif { [::OIM_GUI::IsOIM $chatid] == 1 } {
-			::OIM_GUI::MessageSend $chatid $txt
-			return 0
-		}
-		foreach user [usersInChat $chatid] {
-			set ::OIM_GUI::oim_asksend_[string map {: _} ${user} ] 1
-		}
+			foreach user [usersInChat $chatid] {
+				set ::OIM_GUI::oim_asksend_[string map {: _} ${user} ] 1
+			}
 
-		if {![chatReady $chatid] && [::abook::getVolatileData [lindex [usersInChat $chatid] 0] state] == "FLN" } {
-			if { [::OIM_GUI::MessageSend $chatid $txt] == "no" } {
-				status_log "::MSN::messageTo: chat NOT ready for $chatid\n"
-				::amsn::nackMessage $ackid
-				chatTo $chatid
+			if { [::OIM_GUI::MessageSend $chatid $txt] != "no" } {
 				return 0
 			}
 		}
+
 		ChatQueue $chatid [list ::MSN::SendChatMsg $chatid "$txt" $ackid $friendlyname]
 	}
 	#///////////////////////////////////////////////////////////////////////////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.