diff options
| author | fiaxh <git@mx.ax.lt> | 2018-07-31 17:49:10 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2018-07-31 17:49:10 +0200 |
| commit | a19f988301332680e23fd81031935eb1312d3173 (patch) | |
| tree | 25457cc9a40cb71dd28f8561bf7b296e660dcbbb /main/src/ui | |
| parent | 2e5977df966779c0ae7247b8ad5343425bea1690 (diff) | |
| download | dino-a19f988301332680e23fd81031935eb1312d3173.tar.gz dino-a19f988301332680e23fd81031935eb1312d3173.zip | |
Support MUC avatars
Diffstat (limited to 'main/src/ui')
| -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()); |