[Tkabber-dev] r1367 - branches/xml-import-export/plugins/roster

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Feb 2 17:27:14 MSK 2008


Author: kostix
Date: 2008-02-02 17:27:14 +0300 (Sat, 02 Feb 2008)
New Revision: 1367

Modified:
   branches/xml-import-export/plugins/roster/backup.tcl
Log:
roster/backup.tcl: Fixed a bug triggered on retrieving the roster items upon connecting.


Modified: branches/xml-import-export/plugins/roster/backup.tcl
===================================================================
--- branches/xml-import-export/plugins/roster/backup.tcl	2008-02-02 02:08:11 UTC (rev 1366)
+++ branches/xml-import-export/plugins/roster/backup.tcl	2008-02-02 14:27:14 UTC (rev 1367)
@@ -205,14 +205,15 @@
     }
 
     if {[llength $subtags] > 0} {
-	set sync [namespace current]::sent($connid,status)
-	set $sync WAITING
+	set status [namespace current]::sent($connid,status)
+	set $status WAITING
 	jlib::send_iq set \
 	    [jlib::wrapper:createtag query \
 		 -vars [list xmlns $NS(roster)] \
 		 -subtags $subtags] \
 	    -connection $connid
-	vwait $sync
+	vwait $status
+	unset $status
     }
 }
 
@@ -230,7 +231,7 @@
     upvar 0 sent($connid,status) status
     upvar 0 sent($connid,jids) jids
 
-    if {[string equal $status WAITING]} {
+    if {[info exists status]} {
 	set ix [lsearch -exact $jids $jid]
 	if {$ix >= 0} {
 	    if {[llength $jids] == 1} {



More information about the Tkabber-dev mailing list