summaryrefslogtreecommitdiff
path: root/src/core/handlers.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/handlers.py')
-rw-r--r--src/core/handlers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/handlers.py b/src/core/handlers.py
index e9e1c892..654ce376 100644
--- a/src/core/handlers.py
+++ b/src/core/handlers.py
@@ -170,7 +170,8 @@ def on_message(self, message):
def on_normal_message(self, message):
"""
- When receiving "normal" messages (from someone in our roster)
+ When receiving "normal" messages (not a private message from a
+ muc participant)
"""
if message['type'] == 'error':
return self.information(self.get_error_message(message, deprecated=True), 'Error')
@@ -889,7 +890,7 @@ def on_session_start(self, event):
show=self.status.show)
if config.get('enable_user_nick', True):
- self.xmpp.plugin['xep_0172'].publish_nick(nick=self.own_nick, callback=dumb_callback, block=False)
+ self.xmpp.plugin['xep_0172'].publish_nick(nick=self.own_nick, callback=dumb_callback)
self.xmpp.plugin['xep_0115'].update_caps()
### Other handlers ###