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_selector | |
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_selector')
-rw-r--r-- | main/src/ui/conversation_selector/conversation_row.vala | 2 | ||||
-rw-r--r-- | main/src/ui/conversation_selector/list.vala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala index ce8845f2..d05973db 100644 --- a/main/src/ui/conversation_selector/conversation_row.vala +++ b/main/src/ui/conversation_selector/conversation_row.vala @@ -46,7 +46,7 @@ public abstract class ConversationRow : ListBoxRow { x_button.clicked.connect(on_x_button_clicked); update_name(Util.get_conversation_display_name(stream_interactor, conversation)); - Entities.Message message = stream_interactor.get_module(MessageManager.IDENTITY).get_last_message(conversation); + Entities.Message message = stream_interactor.get_module(MessageStorage.IDENTITY).get_last_message(conversation); if (message != null) { message_received(message); } diff --git a/main/src/ui/conversation_selector/list.vala b/main/src/ui/conversation_selector/list.vala index f580c4c5..2e56a305 100644 --- a/main/src/ui/conversation_selector/list.vala +++ b/main/src/ui/conversation_selector/list.vala @@ -31,10 +31,10 @@ public class List : ListBox { stream_interactor.get_module(ConversationManager.IDENTITY).conversation_activated.connect((conversation) => { Idle.add(() => {add_conversation(conversation); 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(() => {on_message_received(message, conversation); 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(() => {on_message_received(message, conversation); return false;}); }); stream_interactor.get_module(PresenceManager.IDENTITY).show_received.connect((show, jid, account) => { |