summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poezio/tabs/muctab.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index e08ac23a..0a5ee793 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -374,9 +374,13 @@ class MucTab(ChatTab):
return False
def get_nick(self):
- if not config.get('show_muc_jid'):
- return safeJID(self.name).user
- return self.name
+ if config.get('show_muc_jid'):
+ return self.name
+ bookmark = self.core.bookmarks[self.name]
+ if bookmark is not None and bookmark.name:
+ return bookmark.name
+ # TODO: send the disco#info identity name here, if it exists.
+ return safeJID(self.name).user
def get_text_window(self):
return self.text_win