diff options
Diffstat (limited to 'main/src/ui/conversation_summary')
4 files changed, 8 insertions, 8 deletions
diff --git a/main/src/ui/conversation_summary/chat_state_populator.vala b/main/src/ui/conversation_summary/chat_state_populator.vala index 5db2a1f6..291f3537 100644 --- a/main/src/ui/conversation_summary/chat_state_populator.vala +++ b/main/src/ui/conversation_summary/chat_state_populator.vala @@ -89,9 +89,9 @@ private enum StateType { } private class MetaChatStateItem : Plugins.MetaConversationItem { - public override Jid? jid { get; set; } + public override Jid jid { get; set; } public override bool dim { get; set; default=true; } - public override DateTime? sort_time { get; set; default=new DateTime.now_utc().add_years(10); } + public override DateTime sort_time { get; set; default=new DateTime.now_utc().add_years(10); } public override bool can_merge { get; set; default=false; } public override bool requires_avatar { get; set; default=false; } diff --git a/main/src/ui/conversation_summary/content_populator.vala b/main/src/ui/conversation_summary/content_populator.vala index cc014a04..368f2a67 100644 --- a/main/src/ui/conversation_summary/content_populator.vala +++ b/main/src/ui/conversation_summary/content_populator.vala @@ -67,10 +67,10 @@ public class ContentProvider : ContentItemCollection, Object { } public class ContentMetaItem : Plugins.MetaConversationItem { - public override Jid? jid { get; set; } - public override DateTime? sort_time { get; set; } - public override DateTime? display_time { get; set; } - public override Encryption? encryption { get; set; } + public override Jid jid { get; set; } + public override DateTime sort_time { get; set; } + public override DateTime display_time { get; set; } + public override Encryption encryption { get; set; } public ContentItem content_item; private ContentItemWidgetFactory widget_factory; diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_summary/conversation_item_skeleton.vala index 28551b01..46669863 100644 --- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_summary/conversation_item_skeleton.vala @@ -121,7 +121,7 @@ public class ItemMetaDataHeader : Box { update_name_label(); name_label.style_updated.connect(update_name_label); - if (item.encryption != null && item.encryption != Encryption.NONE) { + if (item.encryption != Encryption.NONE) { encryption_image.visible = true; encryption_image.set_from_icon_name("dino-changes-prevent-symbolic", ICON_SIZE_HEADER); } diff --git a/main/src/ui/conversation_summary/date_separator_populator.vala b/main/src/ui/conversation_summary/date_separator_populator.vala index a5c1a887..f1ad17ef 100644 --- a/main/src/ui/conversation_summary/date_separator_populator.vala +++ b/main/src/ui/conversation_summary/date_separator_populator.vala @@ -52,7 +52,7 @@ class DateSeparatorPopulator : Plugins.ConversationItemPopulator, Plugins.Conver } public class MetaDateItem : Plugins.MetaConversationItem { - public override DateTime? sort_time { get; set; } + public override DateTime sort_time { get; set; } public override bool can_merge { get; set; default=false; } public override bool requires_avatar { get; set; default=false; } |