Small bug fixes and compatibility with Vala 0.36

2 files changed, 6 insertions, 7 deletions

diff --git a/plugins/omemo/src/database.vala b/plugins/omemo/src/database.vala
index db530c69..8d69ca15 100644
--- a/plugins/omemo/src/database.vala
+++ b/plugins/omemo/src/database.vala
@@ -1,5 +1,4 @@
 using Gee;
-using Sqlite;
 using Qlite;
 
 using Dino.Entities;
@@ -16,7 +15,7 @@ public class Database : Qlite.Database {
         public Column<string> identity_key_private_base64 = new Column.Text("identity_key_private_base64") { not_null = true };
         public Column<string> identity_key_public_base64 = new Column.Text("identity_key_public_base64") { not_null = true };
 
-        protected IdentityTable(Database db) {
+        internal IdentityTable(Database db) {
             base(db, "identity");
             init({id, account_id, device_id, identity_key_private_base64, identity_key_public_base64});
         }
@@ -27,7 +26,7 @@ public class Database : Qlite.Database {
         public Column<int> signed_pre_key_id = new Column.Integer("signed_pre_key_id") { not_null = true };
         public Column<string> record_base64 = new Column.Text("record_base64") { not_null = true };
 
-        protected SignedPreKeyTable(Database db) {
+        internal SignedPreKeyTable(Database db) {
             base(db, "signed_pre_key");
             init({identity_id, signed_pre_key_id, record_base64});
             unique({identity_id, signed_pre_key_id});
@@ -39,7 +38,7 @@ public class Database : Qlite.Database {
         public Column<int> pre_key_id = new Column.Integer("pre_key_id") { not_null = true };
         public Column<string> record_base64 = new Column.Text("record_base64") { not_null = true };
 
-        protected PreKeyTable(Database db) {
+        internal PreKeyTable(Database db) {
             base(db, "pre_key");
             init({identity_id, pre_key_id, record_base64});
             unique({identity_id, pre_key_id});
@@ -52,7 +51,7 @@ public class Database : Qlite.Database {
         public Column<int> device_id = new Column.Integer("device_id") { not_null = true };
         public Column<string> record_base64 = new Column.Text("record_base64") { not_null = true };
 
-        protected SessionTable(Database db) {
+        internal SessionTable(Database db) {
             base(db, "session");
             init({identity_id, address_name, device_id, record_base64});
             unique({identity_id, address_name, device_id});
diff --git a/plugins/openpgp/src/database.vala b/plugins/openpgp/src/database.vala
index ac80f79a..7d41db3c 100644
--- a/plugins/openpgp/src/database.vala
+++ b/plugins/openpgp/src/database.vala
@@ -11,7 +11,7 @@ public class Database : Qlite.Database {
         public Column<int> account_id = new Column.Integer("account_id") { primary_key = true };
         public Column<string> key = new Column.Text("key") { not_null = true };
 
-        protected AccountSetting(Database db) {
+        internal AccountSetting(Database db) {
             base(db, "account_setting");
             init({account_id, key});
         }
@@ -21,7 +21,7 @@ public class Database : Qlite.Database {
         public Column<string> jid = new Column.Text("jid") { primary_key = true };
         public Column<string> key = new Column.Text("key") { not_null = true };
 
-        protected ContactKey(Database db) {
+        internal ContactKey(Database db) {
             base(db, "contact_key");
             init({jid, key});
         }