aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service/muc_manager.vala
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2017-04-18 17:53:25 +0200
committerMarvin W <git@larma.de>2017-04-18 20:20:41 +0200
commitf95b4f4e0949eefaed871c267626e3ff84ce5ca6 (patch)
treee60469776bcf062d2db15e9968bf6dbd37fa1630 /libdino/src/service/muc_manager.vala
parent765c2605cd0abf2b4431051142f09e2676584222 (diff)
downloaddino-f95b4f4e0949eefaed871c267626e3ff84ce5ca6.tar.gz
dino-f95b4f4e0949eefaed871c267626e3ff84ce5ca6.zip
xmpp-vala/core+libdino: concurrency + nullity improvements
Diffstat (limited to 'libdino/src/service/muc_manager.vala')
-rw-r--r--libdino/src/service/muc_manager.vala5
1 files changed, 2 insertions, 3 deletions
diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala
index a0d6dbe5..3c855c0e 100644
--- a/libdino/src/service/muc_manager.vala
+++ b/libdino/src/service/muc_manager.vala
@@ -161,9 +161,8 @@ public class MucManager : StreamInteractionModule, Object {
});
}
- private void on_stream_negotiated(Account account) {
- Core.XmppStream stream = stream_interactor.get_stream(account);
- if (stream != null) stream.get_module(Xep.Bookmarks.Module.IDENTITY).get_conferences(stream, (stream, conferences, o) => {
+ private void on_stream_negotiated(Account account, Core.XmppStream stream) {
+ stream.get_module(Xep.Bookmarks.Module.IDENTITY).get_conferences(stream, (stream, conferences, o) => {
Tuple<MucManager, Account> tuple = o as Tuple<MucManager, Account>;
MucManager outer_ = tuple.a;
Account account_ = tuple.b;