From c2643a45b0dc05c4fd82ec7d32577700dae7450e Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sun, 12 Mar 2017 19:33:31 +0100
Subject: Qlite: Return OptionalRow instead of Row?, add ability to remove
 columns on version upgrade

---
 plugins/omemo/src/account_settings_widget.vala | 2 +-
 plugins/omemo/src/manager.vala                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/omemo')

diff --git a/plugins/omemo/src/account_settings_widget.vala b/plugins/omemo/src/account_settings_widget.vala
index 87ea0e37..b922c9a6 100644
--- a/plugins/omemo/src/account_settings_widget.vala
+++ b/plugins/omemo/src/account_settings_widget.vala
@@ -30,7 +30,7 @@ public class AccountSettingWidget : Plugins.AccountSettingsWidget, Box {
     public void set_account(Account account) {
         this.account = account;
         try {
-            Qlite.Row? row = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id);
+            Qlite.Row? row = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id).inner;
             if (row == null) {
                 fingerprint.set_markup(@"Own fingerprint\n<span font='8'>Will be generated on first connect</span>");
             } else {
diff --git a/plugins/omemo/src/manager.vala b/plugins/omemo/src/manager.vala
index e5db631e..b2226e2a 100644
--- a/plugins/omemo/src/manager.vala
+++ b/plugins/omemo/src/manager.vala
@@ -99,7 +99,7 @@ public class Manager : StreamInteractionModule, Object {
     private void on_store_created(Account account, Store store) {
         Qlite.Row? row = null;
         try {
-            row = db.identity.row_with(db.identity.account_id, account.id);
+            row = db.identity.row_with(db.identity.account_id, account.id).inner;
         } catch (Error e) {
             // Ignore error
         }
-- 
cgit v1.2.3-70-g09d2