Fixed presence probe typo.

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

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

diff --git a/src/main.py b/src/main.py
index f4f80f93c0f81ed52f4c36d1835903c873c09682..35690e5cd2f9afbbe49d6e46c0828b37f5739112 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -316,10 +316,6 @@ class App:
                pf.write("%s\n" % pid)
                pf.close()
 
-       def alreadyRunning(self):
-               sys.__stdout__.write("There is already a transport instance running with this configuration.\nExiting...\n\n")
-               sys.exit(1)
-       
        def shuttingDown(self):
                self.transportSvc.removeMe()
                # Keep the transport running for another 3 seconds

diff --git a/src/session.py b/src/session.py
index 57e7ff449640e23c008e2eed613afcd246ec8623..42893efef89c9ac73e04657a8ad63c23840bb228 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -266,7 +266,7 @@ class Session(jabw.JabberConnection):
                
                elif ptype == "probe":
                        LogEvent(INFO, self.jabberID, "Responding to presence probe")
-                       self.contactList.getContact(toj.userhost()).sendPresence(fro)
+                       self.contactList.getContact(to).sendPresence(source)
                else:
                        # Not for groupchat
                        self.handleResourcePresence(source, resource, to, tor, priority, ptype, show, status)