OOB file sending works.

[pymsnt] / src / disco.py

diff --git a/src/disco.py b/src/disco.py
index 5fb0746c41abbc50e053cd285febddee49a8195a..cf5ac6614aebd4ae54040bb8596ded473ddc85f2 100644 (file)
--- a/src/disco.py
+++ b/src/disco.py
@@ -2,7 +2,7 @@
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
 import utils
-from tlib.xmlw import Element
+from tlib.xmlw import Element, jid
 from twisted.internet.defer import Deferred
 from twisted.internet import reactor
 from debug import LogEvent, INFO, WARN, ERROR
@@ -20,6 +20,7 @@ CAPS          = "http://jabber.org/protocol/caps"
 SUBSYNC       = "http://jabber.org/protocol/roster-subsync"
 MUC           = "http://jabber.org/protocol/muc"
 MUC_USER      = MUC + "#user"
+FEATURE_NEG   = "http://jabber.org/protocol/feature-neg"
 SI            = "http://jabber.org/protocol/si"
 FT            = "http://jabber.org/protocol/si/profile/file-transfer"
 S5B           = "http://jabber.org/protocol/bytestreams"
@@ -109,8 +110,8 @@ class ServerDiscovery:
                iqType = el.getAttribute("type")
                ulang = utils.getLang(el)
                try: # Stringprep
-                       froj = utils.jid(fro)
-                       to = utils.jid(to).full()
+                       froj = jid.intern(fro)
+                       to = jid.intern(to).full()
                except Exception, e:
                        LogEvent(WARN, "", "Dropping IQ because of stringprep error")
 
@@ -259,8 +260,11 @@ class DiscoRequest:
 
                features = []
 
-               query = el.getElement("query")
-               if not query:
+               for child in el.elements():
+                       if child.name == "query":
+                               query = child
+                               break
+               else:
                        return []
 
                for child in query.elements():