From ab03ad54aaca1725b943abf16585fa4ef6f08897 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 30 Jul 2014 17:52:59 +0200 Subject: Fix the iq.send() function, and a bunch of places where it is called This is a big-and-dirty commit with a bunch of cleanup, maybe breaking a few things, and not fixing all iq.send() calls yet. --- slixmpp/plugins/xep_0012/last_activity.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'slixmpp/plugins/xep_0012/last_activity.py') diff --git a/slixmpp/plugins/xep_0012/last_activity.py b/slixmpp/plugins/xep_0012/last_activity.py index 2fef9ca8..36d21b29 100644 --- a/slixmpp/plugins/xep_0012/last_activity.py +++ b/slixmpp/plugins/xep_0012/last_activity.py @@ -76,8 +76,8 @@ class XEP_0012(BasePlugin): def del_last_activity(self, jid): self.api['del_last_activity'](jid) - def get_last_activity(self, jid, local=False, ifrom=None, block=True, - timeout=None, callback=None): + def get_last_activity(self, jid, local=False, ifrom=None, timeout=None, + callback=None, timeout_callback=None): if jid is not None and not isinstance(jid, JID): jid = JID(jid) @@ -98,9 +98,8 @@ class XEP_0012(BasePlugin): iq['to'] = jid iq['type'] = 'get' iq.enable('last_activity') - return iq.send(timeout=timeout, - block=block, - callback=callback) + return iq.send(timeout=timeout, callback=callback, + timeout_callback=timeout_callback) def _handle_get_last_activity(self, iq): log.debug("Received last activity query from " + \ -- cgit v1.2.3