summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2011-01-02 16:00:47 +0000
committerlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2011-01-02 16:00:47 +0000
commitc29cc8b15facd52aa6f202402565e07b2477146b (patch)
tree6bdee45c13acd4a158e66f561c13ea8d8f653b25
parent11357165186dce6614b03399f025febd4c48183e (diff)
downloadpoezio-c29cc8b15facd52aa6f202402565e07b2477146b.tar.gz
poezio-c29cc8b15facd52aa6f202402565e07b2477146b.tar.bz2
poezio-c29cc8b15facd52aa6f202402565e07b2477146b.tar.xz
poezio-c29cc8b15facd52aa6f202402565e07b2477146b.zip
also fix /join completion (using xep 30), and add a timeout
-rw-r--r--src/core.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core.py b/src/core.py
index 87aa5007..b46bd003 100644
--- a/src/core.py
+++ b/src/core.py
@@ -962,9 +962,9 @@ class Core(object):
if jid.resource or jid.full.endswith('/'):
# we are writing the resource: complete the node
if not the_input.last_completion:
- response = self.xmpp.plugin['xep_0030'].getItems(jid.server)
+ response = self.xmpp.plugin['xep_0030'].get_items(jid=jid.server, block=True, timeout=1)
if response:
- items = response['disco_items'].getItems()
+ items = response['disco_items'].get_items()
else:
return True
items = ['%s/%s' % (tup[0], jid.resource) for tup in items]