From f43f06214ef5bb16de616feb754fcdb56a208192 Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 12 Feb 2014 23:35:10 +0100 Subject: Fix #2458 (correctly display non-groupchat room messages) --- src/core.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3