From d9cbf571b0a5154d524ca65485dbb86a51268a06 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 25 Nov 2018 15:55:51 +0100 Subject: Fix muc avatars sometimes not showing split tiles for occupants --- libdino/src/service/muc_manager.vala | 5 ----- main/src/ui/avatar_image.vala | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index 98700c60..9856e229 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -212,11 +212,6 @@ public class MucManager : StreamInteractionModule, Object { return null; } - public bool has_avatar(Jid muc_jid, Account account) { - Gee.List? full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(muc_jid, account); - return full_jids != null && full_jids.contains(muc_jid); - } - private Xep.Muc.Flag? get_muc_flag(Account account) { XmppStream? stream = stream_interactor.get_stream(account); if (stream != null) { diff --git a/main/src/ui/avatar_image.vala b/main/src/ui/avatar_image.vala index f690637b..bf6cb9f4 100644 --- a/main/src/ui/avatar_image.vala +++ b/main/src/ui/avatar_image.vala @@ -206,7 +206,7 @@ public class AvatarImage : Misc { stream_interactor.connection_manager.connection_state_changed.connect(on_connection_changed); stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect(on_roster_updated); } - if (muc_manager.is_groupchat(jid_, account) && !muc_manager.has_avatar(jid_, account)) { + if (muc_manager.is_groupchat(jid_, account) && avatar_manager.get_avatar(account, jid_) == null) { // Groupchat without avatar Gee.List? occupants = muc_manager.get_other_occupants(jid_, account); jid = jid_; -- cgit v1.2.3-54-g00ecf