From e330e60f83e6e46bbc3d320711709f2448b802e7 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Fri, 18 Oct 2019 16:52:29 +0200
Subject: Base avatars and names on conversation, not JID.

Fixes #598
---
 main/src/ui/conversation_summary/conversation_item_skeleton.vala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main/src/ui/conversation_summary/conversation_item_skeleton.vala')

diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_summary/conversation_item_skeleton.vala
index 1e47fa7c..182ec298 100644
--- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala
+++ b/main/src/ui/conversation_summary/conversation_item_skeleton.vala
@@ -29,7 +29,7 @@ public class ConversationItemSkeleton : EventBox {
         this.get_style_context().add_class("message-box");
 
         if (item.requires_avatar) {
-            image.set_jid(stream_interactor, item.jid, conversation.account);
+            image.set_conversation_participant(stream_interactor, conversation, item.jid);
             image_content_box.add(image);
         }
         if (item.display_time != null) {
@@ -137,7 +137,7 @@ public class ItemMetaDataHeader : Box {
     }
 
     private void update_name_label() {
-        string display_name = Markup.escape_text(Util.get_display_name(stream_interactor, item.jid, conversation.account));
+        string display_name = Markup.escape_text(Util.get_participant_display_name(stream_interactor, conversation, item.jid));
         string color = Util.get_name_hex_color(stream_interactor, conversation.account, item.jid, Util.is_dark_theme(name_label));
         name_label.label = @"<span foreground=\"#$color\">$display_name</span>";
     }
-- 
cgit v1.2.3-70-g09d2