summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-02-12 23:35:10 +0100
committermathieui <mathieui@mathieui.net>2014-02-12 23:36:58 +0100
commitf43f06214ef5bb16de616feb754fcdb56a208192 (patch)
tree65f0dcc3a5097cfb356a886399954facadf2159b /src
parentf1995d060b9e0e72c8b2534dd19c09d2091dc84c (diff)
downloadpoezio-f43f06214ef5bb16de616feb754fcdb56a208192.tar.gz
poezio-f43f06214ef5bb16de616feb754fcdb56a208192.tar.bz2
poezio-f43f06214ef5bb16de616feb754fcdb56a208192.tar.xz
poezio-f43f06214ef5bb16de616feb754fcdb56a208192.zip
Fix #2458 (correctly display non-groupchat room messages)
Diffstat (limited to 'src')
-rw-r--r--src/core.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core.py b/src/core.py
index 42ea5864..38b4f974 100644
--- a/src/core.py
+++ b/src/core.py
@@ -3178,7 +3178,7 @@ class Core(object):
"""
if message['subject']:
return
- room_from = message.getMucroom()
+ room_from = message['from'].bare
if message['type'] == 'error': # Check if it's an error
return self.room_error(message, room_from)
@@ -3237,6 +3237,9 @@ class Core(object):
"""
jid = message['from']
nick_from = jid.resource
+ if not nick_from:
+ return self.on_groupchat_message(message)
+
room_from = jid.bare
body = xhtml.get_body_from_message_stanza(message)
tab = self.get_tab_by_name(jid.full, tabs.PrivateTab) # get the tab with the private conversation