From 07e46837d9da11ce41ea18a5276bfe740aa8dfbc Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Fri, 1 Aug 2014 15:02:54 +0200 Subject: Fix some more blocking iq --- slixmpp/plugins/xep_0280/carbons.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'slixmpp/plugins/xep_0280/carbons.py') diff --git a/slixmpp/plugins/xep_0280/carbons.py b/slixmpp/plugins/xep_0280/carbons.py index 15b07229..a64ccbfd 100644 --- a/slixmpp/plugins/xep_0280/carbons.py +++ b/slixmpp/plugins/xep_0280/carbons.py @@ -66,16 +66,20 @@ class XEP_0280(BasePlugin): def _handle_carbon_sent(self, msg): self.xmpp.event('carbon_sent', msg) - def enable(self, ifrom=None, block=True, timeout=None, callback=None): + def enable(self, ifrom=None, timeout=None, callback=None, + timeout_callback=None): iq = self.xmpp.Iq() iq['type'] = 'set' iq['from'] = ifrom iq.enable('carbon_enable') - return iq.send(block=block, timeout=timeout, callback=callback) + return iq.send(timeout_callback=timeout_callback, timeout=timeout, + callback=callback) - def disable(self, ifrom=None, block=True, timeout=None, callback=None): + def disable(self, ifrom=None, timeout=None, callback=None, + timeout_callback=None): iq = self.xmpp.Iq() iq['type'] = 'set' iq['from'] = ifrom iq.enable('carbon_disable') - return iq.send(block=block, timeout=timeout, callback=callback) + return iq.send(timeout_callback=timeout_callback, timeout=timeout, + callback=callback) -- cgit v1.2.3