[Tkabber-dev] [tclxmpp commit] r110 - * xmpp/disco.tcl: Fixed disco#info and disco#items reply when the

codesite-noreply at google.com codesite-noreply at google.com
Thu Apr 23 14:39:45 MSD 2009


Author: sgolovan
Date: Wed Apr 22 23:13:53 2009
New Revision: 110

Modified:
    trunk/ChangeLog
    trunk/xmpp/disco.tcl

Log:
	* xmpp/disco.tcl: Fixed disco#info and disco#items reply when the
	  query was received to a non-empty node.


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Wed Apr 22 23:13:53 2009
@@ -1,3 +1,8 @@
+2009-04-23  Sergei Golovan  <sgolovan at nes.ru>
+
+	* xmpp/disco.tcl: Fixed disco#info and disco#items reply when the
+	  query was received to a non-empty node.
+
  2009-04-21  Sergei Golovan  <sgolovan at nes.ru>

  	* xmpp/pubsub.tcl: Fixed IQ types in queries which request items or

Modified: trunk/xmpp/disco.tcl
==============================================================================
--- trunk/xmpp/disco.tcl	(original)
+++ trunk/xmpp/disco.tcl	Wed Apr 22 23:13:53 2009
@@ -399,8 +399,15 @@
          lappend restags [::xmpp::data::resultForm $extra]
      }

+    if {[string equal $node ""]} {
+        set resattrs {}
+    } else {
+        set resattrs [list node $node]
+    }
+
      return [list result [::xmpp::xml::create query \
                                  -xmlns  
http://jabber.org/protocol/disco#info \
+                                -attrs $resattrs \
                                  -subelements $restags]]
  }

@@ -427,8 +434,15 @@
          lappend restags [::xmpp::xml::create item -attrs $item]
      }

+    if {[string equal $node ""]} {
+        set resattrs {}
+    } else {
+        set resattrs [list node $node]
+    }
+
      return [list result [::xmpp::xml::create query \
                                  -xmlns  
http://jabber.org/protocol/disco#items \
+                                -attrs $resattrs \
                                  -subelements $restags]]
  }



More information about the Tkabber-dev mailing list