X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/4c9bfc8d92c70245fc650a7df1cbc6e6cc1a050f..cbe38882237ba2dff9191c266ddc04a5e78ebba4:/src/misciq.py

diff --git a/src/misciq.py b/src/misciq.py
index c4fc993..64cbe90 100644
--- a/src/misciq.py
+++ b/src/misciq.py
@@ -5,6 +5,7 @@ import utils
 from twisted.internet import reactor, task, protocol, error
 from tlib.xmlw import Element, jid
 from debug import LogEvent, INFO, WARN, ERROR
+import svninfo
 import jabw
 import legacy
 import disco
@@ -138,7 +139,7 @@ class AdHocCommands:
 
 		node = None
 		for child in el.elements():
-			xmlns = child.defaultUri
+			xmlns = child.uri
 			node = child.getAttribute("node")
 
 			handled = False
@@ -431,6 +432,11 @@ class VersionTeller:
 		self.pytrans = pytrans
 		self.pytrans.discovery.addFeature(disco.IQVERSION, self.incomingIq, config.jid)
 		self.pytrans.discovery.addFeature(disco.IQVERSION, self.incomingIq, "USER")
+		try:
+			self.version = "%s - SVN r%s" % (legacy.version, svninfo.getSVNVersion())
+		except:
+			self.version = legacy.version
+		self.os = "Python" + ".".join([str(x) for x in sys.version_info[0:3]]) + " - " + sys.platform
 	
 	def incomingIq(self, el):
 		eltype = el.getAttribute("type")
@@ -451,9 +457,9 @@ class VersionTeller:
 		name = query.addElement("name")
 		name.addContent(config.discoName)
 		version = query.addElement("version")
-		version.addContent(legacy.version)
+		version.addContent(self.version)
 		os = query.addElement("os")
-		os.addContent("Python" + ".".join([str(x) for x in sys.version_info[0:3]]) + " - " + sys.platform)
+		os.addContent(self.os)
 		
 		self.pytrans.send(iq)
 
@@ -552,7 +558,7 @@ class Socks5FileTransfer:
 		if not (si and si.getAttribute("profile") == disco.FT):
 			return errOut()
 		file = si.file
-		if not (file and file.defaultUri == disco.FT):
+		if not (file and file.uri == disco.FT):
 			return errOut()
 		try:
 			sid = si["id"]
@@ -565,10 +571,10 @@ class Socks5FileTransfer:
 
 		# Check that we can use socks5 bytestreams
 		feature = si.feature
-		if not (feature and feature.defaultUri == disco.FEATURE_NEG):
+		if not (feature and feature.uri == disco.FEATURE_NEG):
 			return errOut()
 		x = feature.x
-		if not (x and x.defaultUri == disco.XDATA):
+		if not (x and x.uri == disco.XDATA):
 			return errOut()
 		field = x.field
 		if not (field and field.getAttribute("var") == "stream-method"):