[Tkabber-dev] r1695 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Feb 27 21:45:52 MSK 2009


Author: sergei
Date: 2009-02-27 21:45:52 +0300 (Fri, 27 Feb 2009)
New Revision: 1695

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/disco.tcl
Log:
	* disco.tcl: Fixed bug with non-existent variable if no extra handlers
	  is registered. Also fixed bug with doubled features in features list
	  returned in reply to disco#info query (it implicated in incorrectly
	  calculated caps hash).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-02-27 13:49:29 UTC (rev 1694)
+++ trunk/tkabber/ChangeLog	2009-02-27 18:45:52 UTC (rev 1695)
@@ -9,6 +9,11 @@
 	  if its capabilities hash was received earlier. Also a bit shortened
 	  hash calculating code.
 
+	* disco.tcl: Fixed bug with non-existent variable if no extra handlers
+	  is registered. Also fixed bug with doubled features in features list
+	  returned in reply to disco#info query (it implicated in incorrectly
+	  calculated caps hash).
+
 2009-02-25  Sergei Golovan  <sgolovan at nes.ru>
 
 	* messages.tcl: Added cancelling subscriptions to roster item popup

Modified: trunk/tkabber/disco.tcl
===================================================================
--- trunk/tkabber/disco.tcl	2009-02-27 13:49:29 UTC (rev 1694)
+++ trunk/tkabber/disco.tcl	2009-02-27 18:45:52 UTC (rev 1695)
@@ -162,12 +162,14 @@
 				   type     pc \
 				   name     Tkabber]]
 
-	set features [lsort [concat [::xmpp::iq::registered $xlib] \
-				    $supported_features]]
+	set features [lsort -unique [concat [::xmpp::iq::registered $xlib] \
+					    $supported_features]]
 	set extras {}
 
-	foreach h $extra_handlers {
-	    lappend extras [eval $h [list $xlib $from $lang]]
+	if {[info exists extra_handlers]} {
+	    foreach h $extra_handlers {
+		lappend extras [eval $h [list $xlib $from $lang]]
+	    }
 	}
 
 	return [list result $identities $features $extras]



More information about the Tkabber-dev mailing list