aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/entity/conversation.vala
diff options
context:
space:
mode:
authorfiaxh <git@mx.ax.lt>2017-08-21 17:16:25 +0200
committerfiaxh <git@mx.ax.lt>2017-08-22 16:22:56 +0200
commit4a4b5956c9b12bbfb583da1794ef0184e760ac33 (patch)
tree05a8581e46cc839e3064e5978e0708ad37a056db /libdino/src/entity/conversation.vala
parenta8aceb1e395e3d0d5a570f6570a1613e2f990d87 (diff)
downloaddino-4a4b5956c9b12bbfb583da1794ef0184e760ac33.tar.gz
dino-4a4b5956c9b12bbfb583da1794ef0184e760ac33.zip
Move settings from GSettings to own db
Diffstat (limited to 'libdino/src/entity/conversation.vala')
-rw-r--r--libdino/src/entity/conversation.vala6
1 files changed, 3 insertions, 3 deletions
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) {