svninfo no longer needed...

[pymsnt] / src / main.py

diff --git a/src/main.py b/src/main.py
index 6b1587a0562a46791ecc2aac36fadce900b18776..5093837a13e7cd2e735875f4c6578b90ef7ec9f3 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -95,7 +95,6 @@ from twisted.words.protocols.jabber.jid import internJID
 from debug import LogEvent, INFO, WARN, ERROR
 
 import debug
-import svninfo
 import utils
 import xdb
 import avatar
@@ -114,10 +113,6 @@ import housekeep
 class PyTransport(component.Service):
        def __init__(self):
                LogEvent(INFO)
-               try:
-                       LogEvent(INFO, msg="SVN r" + str(svninfo.getSVNVersion()))
-               except:
-                       pass
                LogEvent(INFO, msg="Reactor: " + str(reactor))
 
                # Discovery, as well as some builtin features
@@ -127,6 +122,7 @@ class PyTransport(component.Service):
                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")
+               self.discovery.addIdentity("conference", "text", "MSN Groupchat", "ROOM")
                
                self.xdb = xdb.XDB(config.jid, legacy.mangle)
                self.avatarCache = avatar.AvatarCache()