summaryrefslogtreecommitdiff
path: root/slixmpp/plugins
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-07-23 17:01:17 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-07-23 17:01:17 +0200
commit74117453b5c3c2be51206a2b34a3ea2e1818f9d4 (patch)
tree5f9df56ea9f3509c22607779d6001505df57a4d4 /slixmpp/plugins
parent5611b30022fbe6c2b91ffb145d604f3c07ff6898 (diff)
downloadslixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.tar.gz
slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.tar.bz2
slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.tar.xz
slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.zip
Cleanup how events are run, they are always direct by definition now
Diffstat (limited to 'slixmpp/plugins')
-rw-r--r--slixmpp/plugins/xep_0077/register.py2
-rw-r--r--slixmpp/plugins/xep_0078/legacyauth.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/slixmpp/plugins/xep_0077/register.py b/slixmpp/plugins/xep_0077/register.py
index d83ff1a7..7c6d99a0 100644
--- a/slixmpp/plugins/xep_0077/register.py
+++ b/slixmpp/plugins/xep_0077/register.py
@@ -77,7 +77,7 @@ class XEP_0077(BasePlugin):
if self.create_account and self.xmpp.event_handled('register'):
form = self.get_registration()
- self.xmpp.event('register', form, direct=True)
+ self.xmpp.event('register', form)
return True
return False
diff --git a/slixmpp/plugins/xep_0078/legacyauth.py b/slixmpp/plugins/xep_0078/legacyauth.py
index 8d2ea230..eac1b57e 100644
--- a/slixmpp/plugins/xep_0078/legacyauth.py
+++ b/slixmpp/plugins/xep_0078/legacyauth.py
@@ -82,12 +82,12 @@ class XEP_0078(BasePlugin):
resp = iq.send(now=True)
except IqError as err:
log.info("Authentication failed: %s", err.iq['error']['condition'])
- self.xmpp.event('failed_auth', direct=True)
+ self.xmpp.event('failed_auth')
self.xmpp.disconnect()
return True
except IqTimeout:
log.info("Authentication failed: %s", 'timeout')
- self.xmpp.event('failed_auth', direct=True)
+ self.xmpp.event('failed_auth')
self.xmpp.disconnect()
return True
@@ -123,11 +123,11 @@ class XEP_0078(BasePlugin):
result = iq.send(now=True)
except IqError as err:
log.info("Authentication failed")
- self.xmpp.event("failed_auth", direct=True)
+ self.xmpp.event("failed_auth")
self.xmpp.disconnect()
except IqTimeout:
log.info("Authentication failed")
- self.xmpp.event("failed_auth", direct=True)
+ self.xmpp.event("failed_auth")
self.xmpp.disconnect()
self.xmpp.features.add('auth')
@@ -137,7 +137,7 @@ class XEP_0078(BasePlugin):
self.xmpp.boundjid = JID(self.xmpp.requested_jid,
resource=resource,
cache_lock=True)
- self.xmpp.event('session_bind', self.xmpp.boundjid, direct=True)
+ self.xmpp.event('session_bind', self.xmpp.boundjid)
log.debug("Established Session")
self.xmpp.sessionstarted = True