From ef0483765a0fd567f25b1f0af6df04e8973e5624 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Mon, 20 Mar 2017 19:27:39 +0100
Subject: Small bug fixes and compatibility with Vala 0.36

---
 libdino/src/service/roster_manager.vala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libdino/src/service/roster_manager.vala')

diff --git a/libdino/src/service/roster_manager.vala b/libdino/src/service/roster_manager.vala
index 86bd7a21..bb9fbd3a 100644
--- a/libdino/src/service/roster_manager.vala
+++ b/libdino/src/service/roster_manager.vala
@@ -35,10 +35,10 @@ public class RosterManager : StreamInteractionModule, Object {
 
     public Roster.Item? get_roster_item(Account account, Jid jid) {
         Core.XmppStream? stream = stream_interactor.get_stream(account);
-        if (stream != null) {
-            return stream.get_flag(Roster.Flag.IDENTITY).get_item(jid.bare_jid.to_string());
-        }
-        return null;
+        if (stream == null) return null;
+        Xmpp.Roster.Flag? flag = stream.get_flag(Xmpp.Roster.Flag.IDENTITY);
+        if (flag == null) return null;
+        return flag.get_item(jid.bare_jid.to_string());
     }
 
     public void remove_jid(Account account, Jid jid) {
-- 
cgit v1.2.3-54-g00ecf