From 00a069872054b79fec1e29172df995e065485585 Mon Sep 17 00:00:00 2001 From: mathieui Date: Fri, 4 Sep 2015 01:05:56 +0200 Subject: Add timeout_callback to a bunch of plugins as a parameter --- slixmpp/plugins/xep_0080/geoloc.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'slixmpp/plugins/xep_0080/geoloc.py') diff --git a/slixmpp/plugins/xep_0080/geoloc.py b/slixmpp/plugins/xep_0080/geoloc.py index 3f0285bd..c9d97edb 100644 --- a/slixmpp/plugins/xep_0080/geoloc.py +++ b/slixmpp/plugins/xep_0080/geoloc.py @@ -86,7 +86,8 @@ class XEP_0080(BasePlugin): ifrom = kwargs.get('ifrom', None) callback = kwargs.get('callback', None) timeout = kwargs.get('timeout', None) - for param in ('ifrom', 'block', 'callback', 'timeout', 'options'): + timeout_callback = kwargs.get('timeout_callback', None) + for param in ('ifrom', 'block', 'callback', 'timeout', 'options', 'timeout_callback'): if param in kwargs: del kwargs[param] @@ -97,9 +98,10 @@ class XEP_0080(BasePlugin): options=options, ifrom=ifrom, callback=callback, - timeout=timeout) + timeout=timeout, + timeout_callback=timeout_callback) - def stop(self, ifrom=None, callback=None, timeout=None): + def stop(self, ifrom=None, callback=None, timeout=None, timeout_callback=None): """ Clear existing user location information to stop notifications. @@ -115,4 +117,5 @@ class XEP_0080(BasePlugin): return self.xmpp['xep_0163'].publish(geoloc, ifrom=ifrom, callback=callback, - timeout=timeout) + timeout=timeout, + timeout_callback=None) -- cgit v1.2.3