diff options
| author | fiaxh <git@mx.ax.lt> | 2017-04-04 15:47:00 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-04-04 15:57:35 +0200 |
| commit | 75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1 (patch) | |
| tree | f593528003a5f00268988255904dfc8a6752a779 /plugins | |
| parent | ea5d3e50c6fd63ae3a151c883f691e76b9cb1018 (diff) | |
| download | dino-75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1.tar.gz dino-75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1.zip | |
MessageStorage/Processor, correctly resolve conversations (fixup 22adbd3)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/omemo/src/manager.vala | 8 | ||||
| -rw-r--r-- | plugins/openpgp/src/manager.vala | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/omemo/src/manager.vala b/plugins/omemo/src/manager.vala index 67b38bc5..8f50dff9 100644 --- a/plugins/omemo/src/manager.vala +++ b/plugins/omemo/src/manager.vala @@ -65,8 +65,8 @@ public class Manager : StreamInteractionModule, Object { stream_interactor.stream_negotiated.connect(on_stream_negotiated); stream_interactor.account_added.connect(on_account_added); - stream_interactor.get_module(MessageManager.IDENTITY).pre_message_received.connect(on_pre_message_received); - stream_interactor.get_module(MessageManager.IDENTITY).pre_message_send.connect(on_pre_message_send); + stream_interactor.get_module(MessageProcessor.IDENTITY).pre_message_received.connect(on_pre_message_received); + stream_interactor.get_module(MessageProcessor.IDENTITY).pre_message_send.connect(on_pre_message_send); } private void on_pre_message_received(Entities.Message message, Xmpp.Message.Stanza message_stanza, Conversation conversation) { @@ -145,7 +145,7 @@ public class Manager : StreamInteractionModule, Object { } foreach (Entities.Message msg in send_now) { Entities.Conversation conv = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(msg.counterpart, account); - stream_interactor.get_module(MessageManager.IDENTITY).send_xmpp_message(msg, conv, true); + stream_interactor.get_module(MessageProcessor.IDENTITY).send_xmpp_message(msg, conv, true); } } @@ -169,7 +169,7 @@ public class Manager : StreamInteractionModule, Object { } foreach (Entities.Message msg in send_now) { Entities.Conversation conv = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(msg.counterpart, account); - stream_interactor.get_module(MessageManager.IDENTITY).send_xmpp_message(msg, conv, true); + stream_interactor.get_module(MessageProcessor.IDENTITY).send_xmpp_message(msg, conv, true); } } diff --git a/plugins/openpgp/src/manager.vala b/plugins/openpgp/src/manager.vala index a261c2cb..0a145283 100644 --- a/plugins/openpgp/src/manager.vala +++ b/plugins/openpgp/src/manager.vala @@ -26,8 +26,8 @@ namespace Dino.Plugins.OpenPgp { this.db = db; stream_interactor.account_added.connect(on_account_added); - stream_interactor.get_module(MessageManager.IDENTITY).pre_message_received.connect(on_pre_message_received); - stream_interactor.get_module(MessageManager.IDENTITY).pre_message_send.connect(on_pre_message_send); + stream_interactor.get_module(MessageProcessor.IDENTITY).pre_message_received.connect(on_pre_message_received); + stream_interactor.get_module(MessageProcessor.IDENTITY).pre_message_send.connect(on_pre_message_send); } private void on_pre_message_received(Entities.Message message, Xmpp.Message.Stanza message_stanza, Conversation conversation) { |