show bookmark title instead of jid in tabs and roster. Fixes #4420
This commit is contained in:
parent
dbaaca08b8
commit
f5ae955764
|
@ -228,6 +228,12 @@ class GroupchatControl(ChatControlBase):
|
||||||
self.room_jid = self.contact.jid
|
self.room_jid = self.contact.jid
|
||||||
self.nick = contact.name.decode('utf-8')
|
self.nick = contact.name.decode('utf-8')
|
||||||
self.new_nick = ''
|
self.new_nick = ''
|
||||||
|
self.name = ''
|
||||||
|
for bm in gajim.connections[self.account].bookmarks:
|
||||||
|
if bm['jid'] == self.room_jid:
|
||||||
|
self.name = bm['name']
|
||||||
|
break
|
||||||
|
if not self.name:
|
||||||
self.name = self.room_jid.split('@')[0]
|
self.name = self.room_jid.split('@')[0]
|
||||||
|
|
||||||
compact_view = gajim.config.get('compact_view')
|
compact_view = gajim.config.get('compact_view')
|
||||||
|
|
|
@ -795,14 +795,19 @@ class RosterWindow:
|
||||||
status = ''
|
status = ''
|
||||||
|
|
||||||
if contact is None:
|
if contact is None:
|
||||||
# New groupchat
|
|
||||||
contact = gajim.contacts.create_contact(jid=jid, name=jid,
|
|
||||||
groups=[_('Groupchats')], show=show, status=status, sub='none')
|
|
||||||
gajim.contacts.add_contact(account, contact)
|
|
||||||
gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account)
|
gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account)
|
||||||
if gc_control:
|
if gc_control:
|
||||||
# there is a window that we can minimize
|
# there is a window that we can minimize
|
||||||
gajim.interface.minimized_controls[account][jid] = gc_control
|
gajim.interface.minimized_controls[account][jid] = gc_control
|
||||||
|
name = gc_control.name
|
||||||
|
elif jid in gajim.interface.minimized_controls[account]:
|
||||||
|
name = gajim.interface.minimized_controls[account][jid].name
|
||||||
|
else:
|
||||||
|
name = jid.split('@')[0]
|
||||||
|
# New groupchat
|
||||||
|
contact = gajim.contacts.create_contact(jid=jid, name=name,
|
||||||
|
groups=[_('Groupchats')], show=show, status=status, sub='none')
|
||||||
|
gajim.contacts.add_contact(account, contact)
|
||||||
self.add_contact(jid, account)
|
self.add_contact(jid, account)
|
||||||
else:
|
else:
|
||||||
contact.show = show
|
contact.show = show
|
||||||
|
|
Loading…
Reference in New Issue