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 /main/src/ui/conversation_summary | |
| parent | ea5d3e50c6fd63ae3a151c883f691e76b9cb1018 (diff) | |
| download | dino-75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1.tar.gz dino-75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1.zip | |
MessageStorage/Processor, correctly resolve conversations (fixup 22adbd3)
Diffstat (limited to 'main/src/ui/conversation_summary')
| -rw-r--r-- | main/src/ui/conversation_summary/view.vala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/src/ui/conversation_summary/view.vala b/main/src/ui/conversation_summary/view.vala index d264de32..179c14e3 100644 --- a/main/src/ui/conversation_summary/view.vala +++ b/main/src/ui/conversation_summary/view.vala @@ -35,10 +35,10 @@ public class View : Box { stream_interactor.get_module(CounterpartInteractionManager.IDENTITY).received_state.connect((account, jid, state) => { Idle.add(() => { on_received_state(account, jid, state); return false; }); }); - stream_interactor.get_module(MessageManager.IDENTITY).message_received.connect((message, conversation) => { + stream_interactor.get_module(MessageProcessor.IDENTITY).message_received.connect((message, conversation) => { Idle.add(() => { show_message(message, conversation, true); return false; }); }); - stream_interactor.get_module(MessageManager.IDENTITY).message_sent.connect((message, conversation) => { + stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect((message, conversation) => { Idle.add(() => { show_message(message, conversation, true); return false; }); }); stream_interactor.get_module(PresenceManager.IDENTITY).show_received.connect((show, jid, account) => { @@ -65,8 +65,8 @@ public class View : Box { last_conversation_item = null; ArrayList<Object> objects = new ArrayList<Object>(); - Gee.List<Entities.Message>? messages = stream_interactor.get_module(MessageManager.IDENTITY).get_messages(conversation); - if (messages != null && messages.size > 0) { + Gee.List<Entities.Message> messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages(conversation); + if (messages.size > 0) { earliest_message = messages[0]; objects.add_all(messages); } @@ -158,7 +158,7 @@ public class View : Box { if(reloading) return; reloading = true; } - Gee.List<Entities.Message>? messages = stream_interactor.get_module(MessageManager.IDENTITY).get_messages_before(conversation, earliest_message); + Gee.List<Entities.Message>? messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages_before(conversation, earliest_message); if (messages != null && messages.size > 0) { earliest_message = messages[0]; MergedMessageItem? current_item = null; |