From 75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 4 Apr 2017 15:47:00 +0200 Subject: MessageStorage/Processor, correctly resolve conversations (fixup 22adbd3) --- main/src/ui/conversation_summary/view.vala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main/src/ui/conversation_summary') 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 objects = new ArrayList(); - Gee.List? messages = stream_interactor.get_module(MessageManager.IDENTITY).get_messages(conversation); - if (messages != null && messages.size > 0) { + Gee.List 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? messages = stream_interactor.get_module(MessageManager.IDENTITY).get_messages_before(conversation, earliest_message); + Gee.List? 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; -- cgit v1.2.3-54-g00ecf