Committed Remko's patches (env & typing notification fix)

Will look over chatstates soon.

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

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

diff --git a/PyMSNt.py b/PyMSNt.py
index 4f120ac49c52715fe7786d0f57fae596e420d8e8..8736387ea51686221950c85168de554a3d585da7 100644 (file)
--- a/PyMSNt.py
+++ b/PyMSNt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Make 'cwd'/src in the PYTHONPATH
 import sys, os, os.path

diff --git a/src/legacy/glue.py b/src/legacy/glue.py
index 4c84a12209408eaa4f6446d6f54ae2ef4f8c4823..ff56545d8e3e360048ae27cd43bc17e6a2afe5d5 100644 (file)
--- a/src/legacy/glue.py
+++ b/src/legacy/glue.py
@@ -394,6 +394,8 @@ class LegacyConnection(msn.MSNConnection):
        def gotMessage(self, remoteUser, text):
                LogEvent(INFO, self.jabberID)
                source = msn2jid(remoteUser, True)
+               if self.contactTyping.has_key(remoteUser):
+                       del self.contactTyping[remoteUser]
                self.session.sendMessage(self.jabberID, fro=source, body=text, mtype="chat")
                self.session.pytrans.statistics.stats["MessageCount"] += 1