[Amsn-commits] SF.net SVN: amsn:[11330] trunk/amsn/sip.tcl

[<kak...@us...>]

Revision: 11330
          http://amsn.svn.sourceforge.net/amsn/?rev=11330&view=rev
Author:   kakaroto
Date:     2009-07-10 23:19:57 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Make sure that we make amsn think we're using farsight when we're only preparing it.. this is to avoid a bug when we receive a call while we're preparing...

Modified Paths:
--------------
    trunk/amsn/sip.tcl

Modified: trunk/amsn/sip.tcl
===================================================================
--- trunk/amsn/sip.tcl	2009-07-10 23:12:35 UTC (rev 11329)
+++ trunk/amsn/sip.tcl	2009-07-10 23:19:57 UTC (rev 11330)
@@ -2070,6 +2070,7 @@
 	variable prepare_relay_info ""
 	variable specialLogger ""
 	variable call_type ""
+	variable preparing 0
 
 	option -closed -default ""
 	option -prepared -default ""
@@ -2108,6 +2109,7 @@
 		set video_remote_candidates [list]
 		set video_remote_codecs [list]
 		set options(-sipconnection) ""
+		set preparing 0
 	}
 
 	method Closed { } {
@@ -2256,6 +2258,9 @@
 	}
 	
 	method IsInUse { } {
+		if {$preparing} {
+			return 1
+		}
 		if {!$loaded} {
 			return 0
 		}
@@ -2283,6 +2288,7 @@
 	}
 
 	method Prepare { controlling {mode "A6"} } {
+		set preparing 1
 		if {[info exists ::sso] && $::sso != ""} {
 			set prepare_ticket ""
 			$::sso RequireSecurityToken MessengerSecure [list $self PrepareSSOCB $controlling]
@@ -2293,6 +2299,8 @@
 
 		$self Close
 
+		set preparing 1
+
 		set call_type $mode
 
 		if {$specialLogger != ""} {
@@ -2341,6 +2349,7 @@
 			tkwait variable [myvar prepare_relay_info]
 		}
 
+		set preparing 0
 		::Farsight::Prepare [list $self FarsightReady] $controlling $mode $prepare_relay_info 64.14.48.28
 	}
 


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