From 5425243203cbf5f86b33c4014c5aa787c6aae856 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Wed, 9 May 2018 23:19:22 +0200 Subject: Fix empty display names, fix update contact roster name --- main/src/ui/add_conversation/conference_list.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/src/ui/add_conversation') 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()) { -- cgit v1.2.3-54-g00ecf