aboutsummaryrefslogtreecommitdiff
path: root/plugins/openpgp/src
diff options
context:
space:
mode:
authorSamuel Hand <samuel.hand@openmailbox.org>2018-08-11 12:27:57 +0100
committerSamuel Hand <samuel.hand@openmailbox.org>2018-08-11 12:27:57 +0100
commit9d15c464c29536405f625e01dc964f48f1a0227d (patch)
treebb38ba836ff3c51b0c34d56028f72325dd619245 /plugins/openpgp/src
parentd7b5db1d9fb37a310c16d8ffef885f1209a33187 (diff)
parentee5c838a6ba85c9d6e72ac2941a7994505aaa4fc (diff)
downloaddino-9d15c464c29536405f625e01dc964f48f1a0227d.tar.gz
dino-9d15c464c29536405f625e01dc964f48f1a0227d.zip
Merge branch 'master' into omemo-muc
Diffstat (limited to 'plugins/openpgp/src')
-rw-r--r--plugins/openpgp/src/encryption_list_entry.vala2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/openpgp/src/encryption_list_entry.vala b/plugins/openpgp/src/encryption_list_entry.vala
index 7ccd9f73..603c5c94 100644
--- a/plugins/openpgp/src/encryption_list_entry.vala
+++ b/plugins/openpgp/src/encryption_list_entry.vala
@@ -32,7 +32,7 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object {
Gee.List<Jid>? occupants = stream_interactor.get_module(MucManager.IDENTITY).get_occupants(conversation.counterpart, conversation.account);
if (occupants != null) muc_jids.add_all(occupants);
Gee.List<Jid>? offline_members = stream_interactor.get_module(MucManager.IDENTITY).get_offline_members(conversation.counterpart, conversation.account);
- if (occupants != null) muc_jids.add_all(offline_members);
+ if (offline_members != null) muc_jids.add_all(offline_members);
foreach (Jid jid in muc_jids) {
string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, jid);