Fixed another exception.

[pymsnt] / src / jabw.py

diff --git a/src/jabw.py b/src/jabw.py
index 755b49a716540a11506f8176429c7b719c1c9774..e6f2897302744288a6dd37df0396c0fc149cb954 100644 (file)
--- a/src/jabw.py
+++ b/src/jabw.py
@@ -253,7 +253,7 @@ class JabberConnection:
                ptype = el.getAttribute("type")
                if ptype and (ptype.startswith("subscribe") or ptype.startswith("unsubscribe")):
                        LogEvent(INFO, self.jabberID, "Parsed subscription presence packet")
-                       self.subscriptionReceived(toj.userhost(), ptype)
+                       self.subscriptionReceived(fro, toj.userhost(), ptype)
                else:
                        status = None
                        show = None
@@ -267,7 +267,7 @@ class JabberConnection:
                                        show = child.__str__()
                                elif(child.name == "priority"):
                                        priority = child.__str__()
-                               elif(child.defaultUri == disco.XVCARDUPDATE):
+                               elif(child.uri == disco.XVCARDUPDATE):
                                        avatarHash = " "
                                        for child2 in child.elements():
                                                if(child2.name == "photo"):
@@ -299,7 +299,7 @@ class JabberConnection:
                """ Override this method to be notified when presence is received """
                pass
        
-       def subscriptionReceived(self, source, subtype):
+       def subscriptionReceived(self, source, dest, subtype):
                """ Override this method to be notified when a subscription packet is received """
                pass