MSN contacts now have resources.

[pymsnt] / src / jabw.py

diff --git a/src/jabw.py b/src/jabw.py
index ec2904fe608143e891716aaefa8eb63cb6361546..fec844b3cc55d1f8b58cb70fef739dd83d6da1cc 100644 (file)
--- a/src/jabw.py
+++ b/src/jabw.py
@@ -33,8 +33,9 @@ def sendMessage(pytrans, to, fro, body, mtype=None, delay=None):
 def sendPresence(pytrans, to, fro, show=None, status=None, priority=None, ptype=None, avatarHash=None, nickname=None, payload=[]):
        # Strip the resource off any presence subscribes (as per XMPP RFC 3921 Section 5.1.6)
        # Makes eJabberd behave :)
-       if ptype == "subscribe":
+       if ptype in ("subscribe", "subscribed", "unsubscribe", "unsubscribed"):
                to = jid.intern(to).userhost()
+               fro = jid.intern(fro).userhost()
        
        el = Element((None, "presence"))
        el.attributes["to"] = to