Fixes to nickname and file transfer.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@87 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/config-example.xml b/config-example.xml
index 7ddef05eeb39efd86bf6fb9728290886bed47574..b1a5ca039d56ef3ae659fee54a322723ddcb122d 100644 (file)
--- a/config-example.xml
+++ b/config-example.xml
@@ -47,10 +47,12 @@ Do not include the jid of the transport -->
 
 
 <!-- File transfer settings -->
+<!-- Please give the port to listen for Jabber socks5 transfers on. -->
+<ftJabberPort>8010</ftJabberPort>
 <!-- Please give the port to listen for HTTP GETs here (Used in OOB file transfers). -->
-<ftOOBPort>8080</ftOOBPort>
+<!--<ftOOBPort>8011</ftOOBPort>-->
 <!-- Please give the root URL the transport should send to clients. (You can use an Apache reverse proxy to put this on your ordinary website) -->
-<ftOOBRoot>http://jabber.org/msn/files/</ftOOBRoot>
+<!--<ftOOBRoot>http://host.com/msn/files/</ftOOBRoot>-->
 
 <!-- You can choose which users you wish to have as administrators. These users can perform some tasks with Ad-Hoc commands that others cannot -->
 <!--<admins>

diff --git a/src/disco.py b/src/disco.py
index 0d4f110ff427b7034916457274a8e5cc73850a8f..cf5ac6614aebd4ae54040bb8596ded473ddc85f2 100644 (file)
--- a/src/disco.py
+++ b/src/disco.py
@@ -260,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():

diff --git a/src/ft.py b/src/ft.py
index ade2e991cbfe0f52ef7a5370934a14ee99bfa808..753474fa996d97009650a8986aee13f7e226a5d3 100644 (file)
--- a/src/ft.py
+++ b/src/ft.py
@@ -97,7 +97,7 @@ class FTReceive:
                si.attributes["profile"] = disco.FT
                si.attributes["id"] = self.sid
                file = si.addElement("file")
-               file.attributes["profile"] = disco.FT
+               file.attributes["xmlns"] = disco.FT
                file.attributes["size"] = str(self.legacyftp.filesize)
                file.attributes["name"] = self.legacyftp.filename
                # Feature negotiation

diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py
index ffd83c26519e80b668bf514573f4f061d1acc103..535a47104111a79f720f9ae481fada542c12f1b4 100644 (file)
--- a/src/tlib/msn/msnw.py
+++ b/src/tlib/msn/msnw.py
@@ -323,7 +323,7 @@ class MSNConnection:
 
 class SavedEvents:
        def __init__(self):
-               self.nickname = ""
+               self.screenName = ""
                self.statusCode = ""
                self.personal = ""
                self.avatarImageData = ""
@@ -333,8 +333,8 @@ class SavedEvents:
        def send(self, msncon):
                if self.avatarImageData:
                        msncon.notificationClient.changeAvatar(self.avatarImageData, push=False)
-               if self.nickname or self.statusCode or self.personal:
-                       msncon.changeStatus(self.statusCode, self.nickname, self.personal)
+               if self.screenName or self.statusCode or self.personal:
+                       msncon.changeStatus(self.statusCode, self.screenName, self.personal)
                for listType, userHandle in self.addContacts:
                        msncon.addContact(listType, userHandle)
                for listType, userHandle in self.remContacts: