diff options
| author | fiaxh <git@mx.ax.lt> | 2018-05-09 23:19:22 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2018-05-10 22:17:19 +0200 |
| commit | 5425243203cbf5f86b33c4014c5aa787c6aae856 (patch) | |
| tree | cdaf132cfc78358353cfba9b94d5478159b566c8 /main/src/ui/add_conversation | |
| parent | e852a0a60b1f307b59eff1de02748a36b25eec55 (diff) | |
| download | dino-5425243203cbf5f86b33c4014c5aa787c6aae856.tar.gz dino-5425243203cbf5f86b33c4014c5aa787c6aae856.zip | |
Fix empty display names, fix update contact roster name
Diffstat (limited to 'main/src/ui/add_conversation')
| -rw-r--r-- | main/src/ui/add_conversation/conference_list.vala | 2 |
1 files changed, 1 insertions, 1 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()) { |