From c41640887131e1496141a2c64be3e479fe926436 Mon Sep 17 00:00:00 2001
From: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
Date: Fri, 6 Jan 2006 03:34:26 +0000
Subject: [PATCH] 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>
---
 config-example.xml   | 6 ++++--
 src/disco.py         | 7 +++++--
 src/ft.py            | 2 +-
 src/tlib/msn/msnw.py | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/config-example.xml b/config-example.xml
index 7ddef05..b1a5ca0 100644
--- 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 0d4f110..cf5ac66 100644
--- 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 ade2e99..753474f 100644
--- 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 ffd83c2..535a471 100644
--- 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:
-- 
2.39.2