summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-04-07 17:30:25 -0400
committerLance Stout <lancestout@gmail.com>2012-04-07 17:30:25 -0400
commit739128866858670a20b9c0ce5d623ca9848aef3b (patch)
tree9bcd7d0d3fb7d976827e6e4c7c505926b74085a6
parent7734aee7ad43bddc8bd1701f2d2773c4bbba6933 (diff)
downloadslixmpp-739128866858670a20b9c0ce5d623ca9848aef3b.tar.gz
slixmpp-739128866858670a20b9c0ce5d623ca9848aef3b.tar.bz2
slixmpp-739128866858670a20b9c0ce5d623ca9848aef3b.tar.xz
slixmpp-739128866858670a20b9c0ce5d623ca9848aef3b.zip
Tidy up roster_received event and callbacks.
-rw-r--r--sleekxmpp/clientxmpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 02f7776a..1c7937ce 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -223,12 +223,12 @@ class ClientXMPP(BaseXMPP):
iq['roster']['ver'] = self.client_roster.version
if not block and callback is None:
- callback = lambda resp: self._handle_roster(resp, request=True)
+ callback = lambda resp: self._handle_roster(resp)
response = iq.send(block, timeout, callback)
+ self.event('roster_received', response)
if block:
- self.event('roster_received', response)
self._handle_roster(response)
return response