diff options
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/ui/add_conversation/conference_list.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/util/helper.vala | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/main/src/ui/add_conversation/conference_list.vala b/main/src/ui/add_conversation/conference_list.vala index b9f13432..69e8c952 100644 --- a/main/src/ui/add_conversation/conference_list.vala +++ b/main/src/ui/add_conversation/conference_list.vala @@ -85,7 +85,7 @@ internal class ConferenceListRow : ListRow { this.account = account; this.bookmark = bookmark; - name_label.label = bookmark.name ?? bookmark.jid.to_string(); + name_label.label = bookmark.name != null && bookmark.name != "" ? bookmark.name : bookmark.jid.to_string(); if (stream_interactor.get_accounts().size > 1) { via_label.label = "via " + account.bare_jid.to_string(); } else if (bookmark.name != null && bookmark.name != bookmark.jid.to_string()) { diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala index 6d9218e4..3cadfffb 100644 --- a/main/src/ui/util/helper.vala +++ b/main/src/ui/util/helper.vala @@ -60,9 +60,6 @@ public static string get_conversation_display_name(StreamInteractor stream_inter public static string get_display_name(StreamInteractor stream_interactor, Jid jid, Account account) { if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat_occupant(jid, account)) { - if (jid.resourcepart == account.resourcepart) { - return account.alias; // FIXME temporary. remove again. - } return jid.resourcepart; } else { if (jid.equals_bare(account.bare_jid)) { @@ -73,7 +70,7 @@ public static string get_display_name(StreamInteractor stream_interactor, Jid ji } } Roster.Item roster_item = stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(account, jid); - if (roster_item != null && roster_item.name != null) { + if (roster_item != null && roster_item.name != null && roster_item.name != "") { return roster_item.name; } return jid.bare_jid.to_string(); |