summaryrefslogtreecommitdiff
path: root/slixmpp/plugins/xep_0153/vcard_avatar.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-09-04 01:05:56 +0200
committermathieui <mathieui@mathieui.net>2015-09-04 01:05:56 +0200
commit00a069872054b79fec1e29172df995e065485585 (patch)
tree63ba1062ade9bb2e1bfc0a9eaa1ecef32246f032 /slixmpp/plugins/xep_0153/vcard_avatar.py
parent804b23d390fe5733f4f2cbd1b588fbc9b7c42e21 (diff)
downloadslixmpp-00a069872054b79fec1e29172df995e065485585.tar.gz
slixmpp-00a069872054b79fec1e29172df995e065485585.tar.bz2
slixmpp-00a069872054b79fec1e29172df995e065485585.tar.xz
slixmpp-00a069872054b79fec1e29172df995e065485585.zip
Add timeout_callback to a bunch of plugins as a parameter
Diffstat (limited to 'slixmpp/plugins/xep_0153/vcard_avatar.py')
-rw-r--r--slixmpp/plugins/xep_0153/vcard_avatar.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/slixmpp/plugins/xep_0153/vcard_avatar.py b/slixmpp/plugins/xep_0153/vcard_avatar.py
index 8cfe97fa..b2c4caf5 100644
--- a/slixmpp/plugins/xep_0153/vcard_avatar.py
+++ b/slixmpp/plugins/xep_0153/vcard_avatar.py
@@ -59,7 +59,7 @@ class XEP_0153(BasePlugin):
@future_wrapper
def set_avatar(self, jid=None, avatar=None, mtype=None, timeout=None,
- callback=None):
+ callback=None, timeout_callback=None):
if jid is None:
jid = self.xmpp.boundjid.bare
@@ -79,7 +79,8 @@ class XEP_0153(BasePlugin):
new_future = self.xmpp['xep_0054'].publish_vcard(jid=jid,
vcard=vcard,
timeout=timeout,
- callback=next_callback)
+ callback=next_callback,
+ timeout_callback=timeout_callback)
new_future.add_done_callback(propagate_timeout_exception)
def next_callback(result):
@@ -92,7 +93,8 @@ class XEP_0153(BasePlugin):
future.set_result(result)
first_future = self.xmpp['xep_0054'].get_vcard(jid, cached=False, timeout=timeout,
- callback=custom_callback)
+ callback=custom_callback,
+ timeout_callback=timeout_callback)
first_future.add_done_callback(propagate_timeout_exception)
return future