[Tkabber-dev] r1303 - in trunk/tkabber: . plugins/general

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Thu Nov 8 21:10:46 MSK 2007


Author: sergei
Date: 2007-11-08 21:10:45 +0300 (Thu, 08 Nov 2007)
New Revision: 1303

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/general/caps.tcl
Log:
	* plugins/general/caps.tcl: Made hash attribute required and added
	  node attribute to make outgoing caps conforming to XEP-0115 (version
	  1.5).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-11-08 08:48:10 UTC (rev 1302)
+++ trunk/tkabber/ChangeLog	2007-11-08 18:10:45 UTC (rev 1303)
@@ -7,6 +7,10 @@
 	  one pixel and adding any text to it likely switches off smart
 	  scrolling).
 
+	* plugins/general/caps.tcl: Made hash attribute required and added
+	  node attribute to make outgoing caps conforming to XEP-0115 (version
+	  1.5).
+
 2007-11-02  Sergei Golovan  <sgolovan at nes.ru>
 
 	* msgs/de.msg: Updated German translation (thanks to Roger Sondermann).

Modified: trunk/tkabber/plugins/general/caps.tcl
===================================================================
--- trunk/tkabber/plugins/general/caps.tcl	2007-11-08 08:48:10 UTC (rev 1302)
+++ trunk/tkabber/plugins/general/caps.tcl	2007-11-08 18:10:45 UTC (rev 1303)
@@ -78,6 +78,7 @@
 }
 
 proc caps::get_presence_x {varname connid status} {
+    global tkabber_version
     variable hash
     upvar 2 $varname var
 
@@ -93,13 +94,11 @@
     set ver [info_to_hash $child $hash]
     if {[string equal $ver ""]} return
 
-    set vars [list xmlns $::NS(caps)]
-    if {![string equal $hash sha-1]} {
-	lappend vars hash $hash
-    }
-    lappend vars ver $ver
-
-    lappend var [jlib::wrapper:createtag c -vars $vars]
+    lappend var [jlib::wrapper:createtag c \
+		     -vars [list xmlns $::NS(caps) \
+				 hash $hash \
+				 node http://tkabber.jabber.ru/#$tkabber_version \
+				 ver $ver]]
     return
 }
 



More information about the Tkabber-dev mailing list