From dabc2a8b1d2a7bf2019e5f913c736d80f11ceb53 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 13 Jun 2017 16:04:26 +0200 Subject: MUC join behaviour + small MUC error changes --- xmpp-vala/src/core/stanza_attribute.vala | 2 +- xmpp-vala/src/core/stanza_node.vala | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'xmpp-vala/src/core') diff --git a/xmpp-vala/src/core/stanza_attribute.vala b/xmpp-vala/src/core/stanza_attribute.vala index 26e63f80..f751c801 100644 --- a/xmpp-vala/src/core/stanza_attribute.vala +++ b/xmpp-vala/src/core/stanza_attribute.vala @@ -32,7 +32,7 @@ public class StanzaAttribute : StanzaEntry { } } - public string to_string() { + public override string to_string(int i = 0) { return printf(ATTRIBUTE_STRING_FORMAT); } diff --git a/xmpp-vala/src/core/stanza_node.vala b/xmpp-vala/src/core/stanza_node.vala index 026b8ddb..67b8db35 100644 --- a/xmpp-vala/src/core/stanza_node.vala +++ b/xmpp-vala/src/core/stanza_node.vala @@ -42,6 +42,10 @@ public abstract class StanzaEntry { public virtual unowned string? get_string_content() { return val; } + + public virtual string to_string(int i = 0) { + return get_string_content() ?? "(null)"; + } } public class StanzaNode : StanzaEntry { @@ -339,7 +343,7 @@ public class StanzaNode : StanzaEntry { return sb.str; } - public string to_string(int i = 0) { + public override string to_string(int i = 0) { return printf(i, TAG_START_BEGIN_FORMAT, TAG_START_EMPTY_END, TAG_START_CONTENT_END, TAG_END_FORMAT, StanzaAttribute.ATTRIBUTE_STRING_FORMAT); } -- cgit v1.2.3-70-g09d2