aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libdino/src/service/stream_interactor.vala2
-rw-r--r--main/src/ui/add_conversation/conference_details_fragment.vala2
-rw-r--r--main/src/ui/util/helper.vala2
-rw-r--r--xmpp-vala/src/core/xmpp_stream.vala2
4 files changed, 4 insertions, 4 deletions
diff --git a/libdino/src/service/stream_interactor.vala b/libdino/src/service/stream_interactor.vala
index 91707996..d9074fb7 100644
--- a/libdino/src/service/stream_interactor.vala
+++ b/libdino/src/service/stream_interactor.vala
@@ -58,7 +58,7 @@ public class StreamInteractor : Object {
return null;
}
- public T? get<T>() {
+ public new T? get<T>() {
foreach (StreamInteractionModule module in modules) {
if (module.get_type() == typeof(T)) return (T?) module;
}
diff --git a/main/src/ui/add_conversation/conference_details_fragment.vala b/main/src/ui/add_conversation/conference_details_fragment.vala
index 876f7050..47cf228f 100644
--- a/main/src/ui/add_conversation/conference_details_fragment.vala
+++ b/main/src/ui/add_conversation/conference_details_fragment.vala
@@ -87,7 +87,7 @@ protected class ConferenceDetailsFragment : Box {
set {
if (value != null) {
value.clicked.connect(() => {
- on_ok_button_clicked();
+ on_ok_button_clicked.begin();
});
ok_button_ = value;
diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
index 5c72743f..db44103a 100644
--- a/main/src/ui/util/helper.vala
+++ b/main/src/ui/util/helper.vala
@@ -177,8 +177,8 @@ private static string get_groupchat_display_name(StreamInteractor stream_interac
}
private static string get_occupant_display_name(StreamInteractor stream_interactor, Account account, Jid jid, bool me_is_me = false) {
- MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
/* TODO: MUC Real JID
+ MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
if (muc_manager.is_private_room(account, jid.bare_jid)) {
Jid? real_jid = muc_manager.get_real_jid(jid, account);
if (real_jid != null) {
diff --git a/xmpp-vala/src/core/xmpp_stream.vala b/xmpp-vala/src/core/xmpp_stream.vala
index 4bf6e0db..44ecabb4 100644
--- a/xmpp-vala/src/core/xmpp_stream.vala
+++ b/xmpp-vala/src/core/xmpp_stream.vala
@@ -61,7 +61,7 @@ public class XmppStream {
}
if (stream == null) {
debug("Connecting to %s, xmpp-client, tcp (fallback)", this.remote_name.to_string());
- stream = yield (new SocketClient()).connect_async(new NetworkService("xmpp-client", "tcp", this.remote_name.to_string()));
+ stream = yield (new SocketClient()).connect_to_host_async(this.remote_name.to_string(), 5222);
}
if (stream == null) {
throw new IOStreamError.CONNECT("client.connect() returned null");