Merged branches/msnfix 204:217 to trunk

[pymsnt] / src / session.py

diff --git a/src/session.py b/src/session.py
index f4d11bd629650f682ab478cb6e509c249117a281..be2955025cbd5e31956ee1ce492a5aedc025342e 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -1,7 +1,7 @@
-# Copyright 2004-2005 James Bunton <james@delx.cjb.net>
+# Copyright 2004-2006 James Bunton <james@delx.cjb.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
-from tlib.xmlw import jid
+from twisted.words.protocols.jabber.jid import internJID
 
 import utils
 import legacy
@@ -150,7 +150,7 @@ class Session(jabw.JabberConnection):
        def updateNickname(self, nickname):
                self.nickname = nickname
                if not self.nickname:
-                       j = jid.intern(self.jabberID)
+                       j = internJID(self.jabberID)
                        self.nickname = j.user
                self.setStatus(self.show, self.status)