diff options
| author | Samuel Hand <samuel.hand@openmailbox.org> | 2018-08-04 23:37:55 +0100 |
|---|---|---|
| committer | Samuel Hand <samuel.hand@openmailbox.org> | 2018-08-04 23:37:55 +0100 |
| commit | ed3b36d0de50966de907766ac0fd6bc7713f0374 (patch) | |
| tree | eac6ade41c7cb727de429f1eb9b2454b77118045 /main | |
| parent | 01d26bffd890c08dfd374631c498fec614cdf430 (diff) | |
| parent | a19f988301332680e23fd81031935eb1312d3173 (diff) | |
| download | dino-ed3b36d0de50966de907766ac0fd6bc7713f0374.tar.gz dino-ed3b36d0de50966de907766ac0fd6bc7713f0374.zip | |
Merge branch 'master' into omemo-muc
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/ui/avatar_image.vala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/src/ui/avatar_image.vala b/main/src/ui/avatar_image.vala index baee12c7..26955ae0 100644 --- a/main/src/ui/avatar_image.vala +++ b/main/src/ui/avatar_image.vala @@ -178,8 +178,8 @@ 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)) { - // Groupchat + if (muc_manager.is_groupchat(jid_, account) && !muc_manager.has_avatar(jid_, account)) { + // Groupchat without avatar Gee.List<Jid>? occupants = muc_manager.get_other_occupants(jid_, account); jid = jid_; if (occupants == null || occupants.size == 0) { @@ -211,7 +211,7 @@ public class AvatarImage : Misc { } } } else { - // Single user + // Single user or MUC with vcard avatar this.jid = jid_; if (force_update || current_jids.length != 1 || !current_jids[0].equals(jid) || gray != (allow_gray && (!is_counterpart_online(jid) || !is_self_online()))) { set_jids_(new Jid[] { jid }, false, !is_counterpart_online(jid) || !is_self_online()); |