Mercurial > libervia-backend

changeset 875:19d7d077478a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core (xmpp): fix automatic contact deletion
author souliane <souliane@mailoo.org>
date Tue, 25 Feb 2014 18:47:15 +0100
parents 1f5ad976fa32
children 65bf1bc70f6b
files src/core/xmpp.py
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)