core (xmpp): fix automatic contact deletion

This commit is contained in:
souliane 2014-02-25 18:47:15 +01:00
commit afb5e7c9a2

View file

@ -173,9 +173,11 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
d = self.getRoster().addCallback(self.rosterCb)
d.chainDeferred(self.got_roster)
def removeItem(self, to):
"""Remove a contact from roster list"""
xmppim.RosterClientProtocol.removeItem(self, to)
def removeItem(self, to_jid):
"""Remove a contact from roster list
@param to_jid: a JID instance
"""
xmppim.RosterClientProtocol.removeItem(self, to_jid)
#TODO: check IQ result
#XXX: disabled (cf http://wokkel.ik.nu/ticket/56))
@ -383,7 +385,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
item = self.parent.roster.getItem(entity)
if item and item.subscriptionFrom: # we automatically remove contact
debug(_('automatic contact deletion'))
self.host.delContact(entity.userhost(), self.parent.profile)
self.host.delContact(entity, self.parent.profile)
self.host.bridge.subscribe('unsubscribe', entity.userhost(), self.parent.profile)