From a9ea0e9f87e71c60bc570066525d3e3634fbdcc0 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sun, 12 Mar 2017 02:28:23 +0100
Subject: Split OMEMO plug-in into files, various fixes

---
 xmpp-vala/CMakeLists.txt            | 1 -
 xmpp-vala/src/core/stanza_node.vala | 6 +++---
 xmpp-vala/src/core/xmpp_stream.vala | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'xmpp-vala')

diff --git a/xmpp-vala/CMakeLists.txt b/xmpp-vala/CMakeLists.txt
index 62c653e2..d1c66726 100644
--- a/xmpp-vala/CMakeLists.txt
+++ b/xmpp-vala/CMakeLists.txt
@@ -1,6 +1,5 @@
 find_package(Vala REQUIRED)
 find_package(PkgConfig REQUIRED)
-find_package(GPGME REQUIRED)
 find_package(LIBUUID REQUIRED)
 include(GlibCompileResourcesSupport)
 include(${VALA_USE_FILE})
diff --git a/xmpp-vala/src/core/stanza_node.vala b/xmpp-vala/src/core/stanza_node.vala
index f615a240..aff1770d 100644
--- a/xmpp-vala/src/core/stanza_node.vala
+++ b/xmpp-vala/src/core/stanza_node.vala
@@ -99,7 +99,7 @@ public class StanzaNode : StanzaEntry {
         return res.down() == "true" || res == "1";
     }
 
-    public StanzaAttribute get_attribute_raw(string name, string? ns_uri = null) {
+    public StanzaAttribute? get_attribute_raw(string name, string? ns_uri = null) {
         string _name = name;
         string? _ns_uri = ns_uri;
         if (_ns_uri == null) {
@@ -225,12 +225,12 @@ public class StanzaNode : StanzaEntry {
     public ArrayList<StanzaNode> get_deep_subnodes_(va_list l) {
         StanzaNode? node = this;
         string? subnode_name = l.arg();
-        if (subnode_name == null) return null;
+        if (subnode_name == null) return new ArrayList<StanzaNode>();
         while(true) {
             string? s = l.arg();
             if (s == null) break;
             node = node.get_subnode(subnode_name);
-            if (node == null) return null;
+            if (node == null) return new ArrayList<StanzaNode>();
             subnode_name = s;
         }
         return node.get_subnodes(subnode_name);
diff --git a/xmpp-vala/src/core/xmpp_stream.vala b/xmpp-vala/src/core/xmpp_stream.vala
index 38b4abb4..57eafe45 100644
--- a/xmpp-vala/src/core/xmpp_stream.vala
+++ b/xmpp-vala/src/core/xmpp_stream.vala
@@ -93,7 +93,7 @@ public class XmppStream {
         }
     }
 
-    public IOStream? get_stream() {
+    internal IOStream? get_stream() {
         return stream;
     }
 
-- 
cgit v1.2.3-54-g00ecf