diff options
Diffstat (limited to 'libdino')
| -rw-r--r-- | libdino/src/service/calls.vala | 1 | ||||
| -rw-r--r-- | libdino/src/service/history_sync.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/jingle_file_transfers.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/message_processor.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/muc_manager.vala | 4 |
5 files changed, 4 insertions, 7 deletions
diff --git a/libdino/src/service/calls.vala b/libdino/src/service/calls.vala index 35b88866..ebaf8d03 100644 --- a/libdino/src/service/calls.vala +++ b/libdino/src/service/calls.vala @@ -82,7 +82,6 @@ namespace Dino { return (yield get_call_resources(conversation.account, conversation.counterpart)).size > 0 || has_jmi_resources(conversation.counterpart); } else { bool is_private = stream_interactor.get_module(MucManager.IDENTITY).is_private_room(conversation.account, conversation.counterpart); - EntityInfo entity_info = stream_interactor.get_module(EntityInfo.IDENTITY); return is_private && can_initiate_groupcall(conversation.account); } } diff --git a/libdino/src/service/history_sync.vala b/libdino/src/service/history_sync.vala index 08381e44..ed5a04af 100644 --- a/libdino/src/service/history_sync.vala +++ b/libdino/src/service/history_sync.vala @@ -315,7 +315,7 @@ public class Dino.HistorySync { latest_time, latest_id ); } - PageRequestResult page_result = yield fetch_query(account, query_params, range[db.mam_catchup.id]); + yield fetch_query(account, query_params, range[db.mam_catchup.id]); } /** diff --git a/libdino/src/service/jingle_file_transfers.vala b/libdino/src/service/jingle_file_transfers.vala index adf10034..624be607 100644 --- a/libdino/src/service/jingle_file_transfers.vala +++ b/libdino/src/service/jingle_file_transfers.vala @@ -115,8 +115,6 @@ public class JingleFileProvider : FileProvider, Object { } private void on_account_added(Account account) { - XmppStream stream = stream_interactor.get_stream(account); - stream_interactor.module_manager.get_module(account, Xmpp.Xep.JingleFileTransfer.Module.IDENTITY).file_incoming.connect((stream, jingle_file_transfer) => { Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(jingle_file_transfer.peer.bare_jid, account); if (conversation == null) return; diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala index bfecf340..a290132f 100644 --- a/libdino/src/service/message_processor.vala +++ b/libdino/src/service/message_processor.vala @@ -128,7 +128,7 @@ public class MessageProcessor : StreamInteractionModule, Object { // If it's a message from MAM, it's going to be processed by HistorySync which calls run_pipeline_announce later. if (history_sync.process(account, message_stanza)) return; - run_pipeline_announce(account, message_stanza); + run_pipeline_announce.begin(account, message_stanza); } public async void run_pipeline_announce(Account account, Xmpp.MessageStanza message_stanza) { diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index 28520ab9..36a5599f 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -387,7 +387,7 @@ public class MucManager : StreamInteractionModule, Object { } public string? get_own_occupant_id(Account account, Jid muc_jid) { - if (account in own_occupant_ids && muc_jid in own_occupant_ids[account]) { + if (own_occupant_ids.has_key(account) && own_occupant_ids[account].has_key(muc_jid)) { return own_occupant_ids[account][muc_jid]; } return null; @@ -421,7 +421,7 @@ public class MucManager : StreamInteractionModule, Object { } }); stream_interactor.module_manager.get_module(account, Xep.OccupantIds.Module.IDENTITY).received_own_occupant_id.connect( (stream, jid, occupant_id) => { - if (!(account in own_occupant_ids)) { + if (!own_occupant_ids.has_key(account)) { own_occupant_ids[account] = new HashMap<Jid, string>(Jid.hash_bare_func, Jid.equals_bare_func); } own_occupant_ids[account][jid] = occupant_id; |