Added a discoName option

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

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

diff --git a/config-example.xml b/config-example.xml
index d1cd43eea6d4b3af7dce43e2d43dbc18a09116db..36cb2d4e1b826bd78c1ccb536dac2343f07bfcba 100644 (file)
--- a/config-example.xml
+++ b/config-example.xml
@@ -8,6 +8,8 @@
 <host>127.0.0.1</host>
 <!-- The component JID of the transport. Unless you're doing clustering, leave this alone -->
 <!-- <compjid>msn1</compjid> -->
+<!-- The name of the transport in the service discovery list. -->
+<!-- <discoName>MSN Transport</discoName> -->
 
 
 <!-- The location of the spool directory.. if relative, relative to the PyMSNt dir.

diff --git a/src/baseproto/glue.py b/src/baseproto/glue.py
index 5dd6489f9f49b1067dfb492f202cf81327efd990..017ec1c07ad3f573caf6f7b981be655475870d98 100644 (file)
--- a/src/baseproto/glue.py
+++ b/src/baseproto/glue.py
@@ -11,9 +11,6 @@ import lang
 import config
 
 
-# The name of the transport
-name = "Foo Transport"
-
 # The URL of the transport's home page
 url = "http://foo.jabberstudio.org"
 

diff --git a/src/config.py b/src/config.py
index dca4a70ea8c105decd87fe8d2530175bd21bf59a..ea27cccb87fa69c992b2213c8fb980a78f9bc88c 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -5,6 +5,7 @@ jid = "msn"
 host = "127.0.0.1"
 compjid = ""
 spooldir = ""
+discoName = "MSN Transport"
 
 mainServer = "127.0.0.1"
 website = ""

diff --git a/src/legacy/glue.py b/src/legacy/glue.py
index ff56545d8e3e360048ae27cd43bc17e6a2afe5d5..5445a3bdf81d8f75c0b8c48133450056e6a664c7 100644 (file)
--- a/src/legacy/glue.py
+++ b/src/legacy/glue.py
@@ -17,7 +17,6 @@ import lang
 
 
 
-name = "MSN Transport"   # The name of the transport
 url = "http://msn-transport.jabberstudio.org"
 version = "0.11-dev"         # The transport version
 mangle = True            # XDB '@' -> '%' mangling

diff --git a/src/main.py b/src/main.py
index 8dca203aeb2e64a9518a79c633786fe14bcb6208..902ef7927619f9bb54a21c71b18075517008d8a7 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -117,8 +117,8 @@ class PyTransport(component.Service):
 
                # Discovery, as well as some builtin features
                self.discovery = disco.ServerDiscovery(self)
-               self.discovery.addIdentity("gateway", legacy.id, legacy.name, config.jid)
-               self.discovery.addIdentity("conference", "text", legacy.name + " Chatrooms", config.jid)
+               self.discovery.addIdentity("gateway", legacy.id, config.discoName, config.jid)
+               self.discovery.addIdentity("conference", "text", config.discoName + " Chatrooms", config.jid)
                self.discovery.addFeature(disco.XCONFERENCE, None, config.jid) # So that clients know you can create groupchat rooms on the server
                self.discovery.addFeature("jabber:iq:conference", None, config.jid) # We don't actually support this, but Psi has a bug where it looks for this instead of the above
                self.discovery.addIdentity("client", "pc", "MSN Messenger", "USER")

diff --git a/src/misciq.py b/src/misciq.py
index 1056cc8d5ebb172b449686950742ad80c28b2ef6..c4fc993ed4b11ed2558b323d399c5ac459cd870c 100644 (file)
--- a/src/misciq.py
+++ b/src/misciq.py
@@ -255,9 +255,9 @@ class VCardFactory:
                vCard.attributes["xmlns"] = "vcard-temp"
                if toGateway:
                        FN = vCard.addElement("FN")
-                       FN.addContent(legacy.name)
+                       FN.addContent(config.discoName)
                        DESC = vCard.addElement("DESC")
-                       DESC.addContent(legacy.name)
+                       DESC.addContent(config.discoName)
                        URL = vCard.addElement("URL")
                        URL.addContent(legacy.url)
                else:
@@ -449,7 +449,7 @@ class VersionTeller:
                query = iq.addElement("query")
                query.attributes["xmlns"] = disco.IQVERSION
                name = query.addElement("name")
-               name.addContent(legacy.name)
+               name.addContent(config.discoName)
                version = query.addElement("version")
                version.addContent(legacy.version)
                os = query.addElement("os")