core (xmpp): fix automatic contact deletion
This commit is contained in:
parent
ab35456577
commit
afb5e7c9a2
1 changed files with 6 additions and 4 deletions
|
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue