display the resource in the chat dialog when printing a private MUC message

This commit is contained in:
souliane 2015-04-24 16:10:46 +02:00
commit f978524b22
2 changed files with 14 additions and 2 deletions

View file

@ -158,9 +158,9 @@ class QuickChat(quick_widgets.QuickWidget):
def _get_nick(self, entity):
"""Return nick of this entity when possible"""
if self.type == C.CHAT_GROUP:
return entity.resource
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
if entity.bare in contact_list:
return contact_list.getCache(entity,'nick') or contact_list.getCache(entity,'name') or entity.node or entity
return entity.node or entity

View file

@ -243,6 +243,18 @@ class QuickContactList(QuickWidget):
return self._specials
return set([entity for entity in self._specials if self.getCache(entity, C.CONTACT_SPECIAL) == special_type])
def getSpecialExtras(self, special_type=None):
"""Return all the JIDs of the special extras entities that are related
to a special entity of the type specified by special_type.
If special_type is None, return all special extras.
@param special_type: one of special type (e.g. C.CONTACT_SPECIAL_GROUP) or None to return all special extras.
@return: set(jid.JID)
"""
if special_type is None:
return self._special_extras
return set([extra for extra in self._special_extras if extra.bare in self.getSpecials(special_type)])
def clearContacts(self):
"""Clear all the contact list"""
self.unselectAll()