diff options
| author | fiaxh <git@lightrise.org> | 2021-05-11 12:57:02 +0200 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2021-05-11 12:57:02 +0200 |
| commit | d71604913dd5b3372a823320db83c37c845fac5c (patch) | |
| tree | 2ffbff97a02c81d48d8aef4a4b7ee870507236e9 /main/src/ui/conversation_content_view/content_populator.vala | |
| parent | e92ed27317ae398c867c946cf7206b1f0b32f3b4 (diff) | |
| parent | 90f9ecf62b2ebfef14de2874e7942552409632bf (diff) | |
| download | dino-d71604913dd5b3372a823320db83c37c845fac5c.tar.gz dino-d71604913dd5b3372a823320db83c37c845fac5c.zip | |
Merge remote-tracking branch 'origin/feature/calls'
Diffstat (limited to 'main/src/ui/conversation_content_view/content_populator.vala')
| -rw-r--r-- | main/src/ui/conversation_content_view/content_populator.vala | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/src/ui/conversation_content_view/content_populator.vala b/main/src/ui/conversation_content_view/content_populator.vala index 97f15bf9..ef859bde 100644 --- a/main/src/ui/conversation_content_view/content_populator.vala +++ b/main/src/ui/conversation_content_view/content_populator.vala @@ -68,7 +68,10 @@ public class ContentProvider : ContentItemCollection, Object { return new MessageMetaItem(content_item, stream_interactor); } else if (content_item.type_ == FileItem.TYPE) { return new FileMetaItem(content_item, stream_interactor); + } else if (content_item.type_ == CallItem.TYPE) { + return new CallMetaItem(content_item, stream_interactor); } + critical("Got unknown content item type %s", content_item.type_); return null; } } @@ -85,6 +88,7 @@ public abstract class ContentMetaItem : Plugins.MetaConversationItem { this.mark = content_item.mark; content_item.bind_property("mark", this, "mark"); + content_item.bind_property("encryption", this, "encryption"); this.can_merge = true; this.requires_avatar = true; |