Base avatars and names on conversation, not JID.

Fixes #598

2 files changed, 4 insertions, 3 deletions

diff --git a/main/src/ui/add_conversation/conference_list.vala b/main/src/ui/add_conversation/conference_list.vala
index 435d42e0..f18a89d5 100644
--- a/main/src/ui/add_conversation/conference_list.vala
+++ b/main/src/ui/add_conversation/conference_list.vala
@@ -118,7 +118,7 @@ internal class ConferenceListRow : ListRow {
             via_label.visible = false;
         }
 
-        image.set_jid(stream_interactor, jid, account);
+        image.set_conversation(stream_interactor, new Conversation(jid, account, Conversation.Type.GROUPCHAT));
     }
 }
 
diff --git a/main/src/ui/add_conversation/list_row.vala b/main/src/ui/add_conversation/list_row.vala
index 2d15c32a..4dec567a 100644
--- a/main/src/ui/add_conversation/list_row.vala
+++ b/main/src/ui/add_conversation/list_row.vala
@@ -22,7 +22,8 @@ public class ListRow : ListBoxRow {
         this.jid = jid;
         this.account = account;
 
-        string display_name = Util.get_display_name(stream_interactor, jid, account);
+        Conversation conv = new Conversation(jid, account, Conversation.Type.CHAT);
+        string display_name = Util.get_conversation_display_name(stream_interactor, conv);
         if (show_account && stream_interactor.get_accounts().size > 1) {
             via_label.label = @"via $(account.bare_jid)";
             this.has_tooltip = true;
@@ -33,7 +34,7 @@ public class ListRow : ListBoxRow {
             via_label.visible = false;
         }
         name_label.label = display_name;
-        image.set_jid(stream_interactor, jid, account);
+        image.set_conversation(stream_interactor, conv);
     }
 }