From 5425243203cbf5f86b33c4014c5aa787c6aae856 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Wed, 9 May 2018 23:19:22 +0200
Subject: Fix empty display names, fix update contact roster name

---
 main/data/add_conversation/list_row.ui              | 1 +
 main/data/conversation_selector/conversation_row.ui | 1 +
 main/src/ui/add_conversation/conference_list.vala   | 2 +-
 main/src/ui/util/helper.vala                        | 5 +----
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'main')

diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui
index 4b3e409f..2eabec11 100644
--- a/main/data/add_conversation/list_row.ui
+++ b/main/data/add_conversation/list_row.ui
@@ -13,6 +13,7 @@
                         <property name="allow_gray">False</property>
                         <property name="height">30</property>
                         <property name="width">30</property>
+                        <property name="valign">center</property>
                         <property name="visible">True</property>
                     </object>
                 </child>
diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui
index fa5df4e4..3e178c4f 100644
--- a/main/data/conversation_selector/conversation_row.ui
+++ b/main/data/conversation_selector/conversation_row.ui
@@ -18,6 +18,7 @@
                             <object class="DinoUiAvatarImage" id="image">
                                 <property name="height">40</property>
                                 <property name="width">40</property>
+                                <property name="valign">center</property>
                                 <property name="visible">True</property>
                             </object>
                         </child>
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();
-- 
cgit v1.2.3-54-g00ecf