From 8c5957537c63e2a8b9a937fe99db509b153df6c6 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Wed, 22 Jan 2020 00:09:06 +0100
Subject: Fix some compiler warnings

---
 libdino/src/plugin/interfaces.vala          | 10 +++++-----
 libdino/src/service/content_item_store.vala | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'libdino')

diff --git a/libdino/src/plugin/interfaces.vala b/libdino/src/plugin/interfaces.vala
index 2c9fb69d..b8c98dde 100644
--- a/libdino/src/plugin/interfaces.vala
+++ b/libdino/src/plugin/interfaces.vala
@@ -91,14 +91,14 @@ public abstract interface NotificationPopulator : Object {
 
 public abstract class MetaConversationItem : Object {
     public virtual string populator_id { get; set; }
-    public virtual Jid? jid { get; set; default=null; }
+    public virtual Jid jid { get; set; }
     public virtual bool dim { get; set; default=false; }
-    public virtual DateTime? sort_time { get; set; default=null; }
+    public virtual DateTime sort_time { get; set; default = new DateTime.now_utc(); }
     public virtual long seccondary_sort_indicator { get; set; }
     public virtual long tertiary_sort_indicator { get; set; }
-    public virtual DateTime? display_time { get; set; default=null; }
-    public virtual Encryption? encryption { get; set; default=null; }
-    public virtual Entities.Message.Marked? mark { get; set; default=null; }
+    public virtual DateTime display_time { get; set; default = new DateTime.now_utc(); }
+    public virtual Encryption encryption { get; set; default = Encryption.NONE; }
+    public virtual Entities.Message.Marked mark { get; set; default = Entities.Message.Marked.NONE; }
 
     public abstract bool can_merge { get; set; }
     public abstract bool requires_avatar { get; set; }
diff --git a/libdino/src/service/content_item_store.vala b/libdino/src/service/content_item_store.vala
index 8be4d85f..1e2ee85a 100644
--- a/libdino/src/service/content_item_store.vala
+++ b/libdino/src/service/content_item_store.vala
@@ -223,11 +223,11 @@ public interface ContentFilter : Object {
 public abstract class ContentItem : Object {
     public int id { get; set; }
     public string type_ { get; set; }
-    public Jid? jid { get; set; default=null; }
-    public DateTime? sort_time { get; set; default=null; }
-    public DateTime? display_time { get; set; default=null; }
-    public Encryption? encryption { get; set; default=null; }
-    public Entities.Message.Marked? mark { get; set; default=null; }
+    public Jid jid { get; set; }
+    public DateTime sort_time { get; set; }
+    public DateTime display_time { get; set; }
+    public Encryption encryption { get; set; }
+    public Entities.Message.Marked mark { get; set; }
 
     ContentItem(int id, string ty, Jid jid, DateTime sort_time, DateTime display_time, Encryption encryption, Entities.Message.Marked mark) {
         this.id = id;
-- 
cgit v1.2.3-54-g00ecf