From 042e19b812a389b30001bbcde7b0f4e9166e6926 Mon Sep 17 00:00:00 2001 From: souliane Date: Tue, 14 Jul 2015 16:49:29 +0200 Subject: [PATCH] quick_frontend (quick_chat): QuickChat._get_nick returns "" instead of None for message from the MUC --- frontends/src/quick_frontend/quick_chat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontends/src/quick_frontend/quick_chat.py b/frontends/src/quick_frontend/quick_chat.py index bb42458b..4579dd44 100644 --- a/frontends/src/quick_frontend/quick_chat.py +++ b/frontends/src/quick_frontend/quick_chat.py @@ -160,9 +160,9 @@ class QuickChat(quick_widgets.QuickWidget): """Return nick of this entity when possible""" contact_list = self.host.contact_lists[self.profile] if self.type == C.CHAT_GROUP or entity in contact_list.getSpecialExtras(C.CONTACT_SPECIAL_GROUP): - return entity.resource + return entity.resource or "" if entity.bare in contact_list: - return contact_list.getCache(entity,'nick') or contact_list.getCache(entity,'name') or entity.node or entity + return contact_list.getCache(entity, 'nick') or contact_list.getCache(entity, 'name') or entity.node or entity return entity.node or entity def onPrivateCreated(self, widget):