# HG changeset patch # User souliane # Date 1393350435 -3600 # Node ID 19d7d077478a3ea52e7d21f3c51b9f2f84aa5a37 # Parent 1f5ad976fa32e75847f83fd93c79aae60289fbba core (xmpp): fix automatic contact deletion diff -r 1f5ad976fa32 -r 19d7d077478a src/core/xmpp.py --- a/src/core/xmpp.py Wed Feb 26 09:34:46 2014 +0100 +++ b/src/core/xmpp.py Tue Feb 25 18:47:15 2014 +0100 @@ -173,9 +173,11 @@ 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 @@ 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)