aboutsummaryrefslogtreecommitdiff
path: root/xmpp-vala/src/core
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2017-03-12 02:28:23 +0100
committerMarvin W <git@larma.de>2017-03-12 03:17:21 +0100
commita9ea0e9f87e71c60bc570066525d3e3634fbdcc0 (patch)
treee0db0fdd3cae07ee731de8e6ea1b112537323ebc /xmpp-vala/src/core
parent7e1ecb34cb1eca2b74949c7ddc2ad52fb02e3a77 (diff)
downloaddino-a9ea0e9f87e71c60bc570066525d3e3634fbdcc0.tar.gz
dino-a9ea0e9f87e71c60bc570066525d3e3634fbdcc0.zip
Split OMEMO plug-in into files, various fixes
Diffstat (limited to 'xmpp-vala/src/core')
-rw-r--r--xmpp-vala/src/core/stanza_node.vala6
-rw-r--r--xmpp-vala/src/core/xmpp_stream.vala2
2 files changed, 4 insertions, 4 deletions
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;
}