From 7d2e64769067c1b47e0500f6456dd7e6f4eb435a Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 29 Apr 2021 15:56:22 +0200
Subject: Improve call wording, cleanup

---
 xmpp-vala/src/module/xep/0166_jingle/component.vala | 12 +++++++++++-
 xmpp-vala/src/module/xep/0166_jingle/content.vala   |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'xmpp-vala/src/module/xep/0166_jingle')

diff --git a/xmpp-vala/src/module/xep/0166_jingle/component.vala b/xmpp-vala/src/module/xep/0166_jingle/component.vala
index 544bcd69..5d573522 100644
--- a/xmpp-vala/src/module/xep/0166_jingle/component.vala
+++ b/xmpp-vala/src/module/xep/0166_jingle/component.vala
@@ -31,7 +31,11 @@ namespace Xmpp.Xep.Jingle {
         protected Gee.Promise<IOStream> promise = new Gee.Promise<IOStream>();
         private string? terminated = null;
 
-        public async void init(IOStream stream) {
+        public async void set_stream(IOStream? stream) {
+            if (stream == null) {
+                promise.set_exception(new IOError.FAILED("Jingle connection failed"));
+                return;
+            }
             assert(!this.stream.ready);
             promise.set_value(stream);
             if (terminated != null) {
@@ -39,11 +43,17 @@ namespace Xmpp.Xep.Jingle {
             }
         }
 
+        public void set_error(GLib.Error? e) {
+            promise.set_exception(e);
+        }
+
         public override async void terminate(bool we_terminated, string? reason_name = null, string? reason_text = null) {
             if (terminated == null) {
                 terminated = (reason_name ?? "") + " - " + (reason_text ?? "") + @"we terminated? $we_terminated";
                 if (stream.ready) {
                     yield stream.value.close_async();
+                } else {
+                    promise.set_exception(new IOError.FAILED("Jingle connection failed"));
                 }
             }
         }
diff --git a/xmpp-vala/src/module/xep/0166_jingle/content.vala b/xmpp-vala/src/module/xep/0166_jingle/content.vala
index befe02f4..41310aeb 100644
--- a/xmpp-vala/src/module/xep/0166_jingle/content.vala
+++ b/xmpp-vala/src/module/xep/0166_jingle/content.vala
@@ -36,7 +36,7 @@ public class Xmpp.Xep.Jingle.Content : Object {
 
     public HashMap<string, ContentEncryption> encryptions = new HashMap<string, ContentEncryption>();
 
-    public Set<string> tried_transport_methods = new HashSet<string>();
+    private Set<string> tried_transport_methods = new HashSet<string>();
 
 
     public Content.initiate_sent(string content_name, Senders senders,
@@ -109,7 +109,7 @@ public class Xmpp.Xep.Jingle.Content : Object {
         transport_params.dispose();
 
         foreach (ComponentConnection connection in component_connections.values) {
-            connection.terminate(we_terminated, reason_name, reason_text);
+            connection.terminate.begin(we_terminated, reason_name, reason_text);
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf