From 4a4b5956c9b12bbfb583da1794ef0184e760ac33 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 21 Aug 2017 17:16:25 +0200 Subject: Move settings from GSettings to own db --- libdino/src/entity/conversation.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libdino/src/entity/conversation.vala') diff --git a/libdino/src/entity/conversation.vala b/libdino/src/entity/conversation.vala index fa78c619..d0a3e9d7 100644 --- a/libdino/src/entity/conversation.vala +++ b/libdino/src/entity/conversation.vala @@ -93,7 +93,7 @@ public class Conversation : Object { public NotifySetting get_notification_setting(StreamInteractor stream_interactor) { Xmpp.Core.XmppStream? stream = stream_interactor.get_stream(account); if (notify_setting != NotifySetting.DEFAULT) return notify_setting; - if (!Settings.instance().notifications) return NotifySetting.OFF; + if (!Application.get_default().settings.notifications) return NotifySetting.OFF; if (type_ == Type.GROUPCHAT) { bool members_only = stream.get_flag(Xmpp.Xep.Muc.Flag.IDENTITY).has_room_feature(counterpart.bare_jid.to_string(), Xmpp.Xep.Muc.Feature.MEMBERS_ONLY); return members_only ? NotifySetting.ON : NotifySetting.HIGHLIGHT; @@ -104,12 +104,12 @@ public class Conversation : Object { public Setting get_send_typing_setting() { if (send_typing != Setting.DEFAULT) return send_typing; - return Settings.instance().send_typing ? Setting.ON : Setting.OFF; + return Application.get_default().settings.send_typing ? Setting.ON : Setting.OFF; } public Setting get_send_marker_setting() { if (send_marker != Setting.DEFAULT) return send_marker; - return Settings.instance().send_marker ? Setting.ON : Setting.OFF; + return Application.get_default().settings.send_marker ? Setting.ON : Setting.OFF; } public bool equals(Conversation? conversation) { -- cgit v1.2.3-54-g00ecf