diff options
author | Marvin W <git@larma.de> | 2017-03-12 19:33:31 +0100 |
---|---|---|
committer | Marvin W <git@larma.de> | 2017-03-12 20:55:11 +0100 |
commit | c2643a45b0dc05c4fd82ec7d32577700dae7450e (patch) | |
tree | d8a52d8eeee351f8279f9827b7e6d1b8024e7beb /plugins/omemo | |
parent | 4f34e431163ac49e2c41079d44c5dd4a71b362d1 (diff) | |
download | dino-c2643a45b0dc05c4fd82ec7d32577700dae7450e.tar.gz dino-c2643a45b0dc05c4fd82ec7d32577700dae7450e.zip |
Qlite: Return OptionalRow instead of Row?, add ability to remove columns on version upgrade
Diffstat (limited to 'plugins/omemo')
-rw-r--r-- | plugins/omemo/src/account_settings_widget.vala | 2 | ||||
-rw-r--r-- | plugins/omemo/src/manager.vala | 2 |
2 files changed, 2 insertions, 2 deletions
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 } |