diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-08-01 15:02:54 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-08-01 15:02:54 +0200 |
| commit | 07e46837d9da11ce41ea18a5276bfe740aa8dfbc (patch) | |
| tree | 9667459e59db49b9a321830f56a28c0085d34581 /slixmpp/plugins/xep_0280/carbons.py | |
| parent | fa21e262c77ccabceedc279d2f0b3650a60a1023 (diff) | |
| download | slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.tar.gz slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.tar.bz2 slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.tar.xz slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.zip | |
Fix some more blocking iq
Diffstat (limited to 'slixmpp/plugins/xep_0280/carbons.py')
| -rw-r--r-- | slixmpp/plugins/xep_0280/carbons.py | 12 |
1 files changed, 8 insertions, 4 deletions
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) |