From db57a973534f099af2b150f1a1307d1948553d9f Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 19 Mar 2017 12:55:36 +0100 Subject: Add typed identity to manager modules and stream flags --- libdino/src/service/conversation_manager.vala | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'libdino/src/service/conversation_manager.vala') diff --git a/libdino/src/service/conversation_manager.vala b/libdino/src/service/conversation_manager.vala index df4300e2..ada9ee9d 100644 --- a/libdino/src/service/conversation_manager.vala +++ b/libdino/src/service/conversation_manager.vala @@ -5,8 +5,8 @@ using Dino.Entities; namespace Dino { public class ConversationManager : StreamInteractionModule, Object { - - public const string id = "conversation_manager"; + public static ModuleIdentity IDENTITY = new ModuleIdentity("conversation_manager"); + public string id { get { return IDENTITY.id; } } public signal void conversation_activated(Conversation conversation); @@ -25,9 +25,9 @@ public class ConversationManager : StreamInteractionModule, Object { this.stream_interactor = stream_interactor; stream_interactor.add_module(this); stream_interactor.account_added.connect(on_account_added); - MucManager.get_instance(stream_interactor).groupchat_joined.connect(on_groupchat_joined); - MessageManager.get_instance(stream_interactor).pre_message_received.connect(on_message_received); - MessageManager.get_instance(stream_interactor).message_sent.connect(on_message_sent); + stream_interactor.get_module(MucManager.IDENTITY).groupchat_joined.connect(on_groupchat_joined); + stream_interactor.get_module(MessageManager.IDENTITY).pre_message_received.connect(on_message_received); + stream_interactor.get_module(MessageManager.IDENTITY).message_sent.connect(on_message_sent); } public Conversation? get_conversation(Jid jid, Account account) { @@ -55,14 +55,6 @@ public class ConversationManager : StreamInteractionModule, Object { } - public string get_id() { - return id; - } - - public static ConversationManager? get_instance(StreamInteractor stream_interaction) { - return (ConversationManager) stream_interaction.get_module(id); - } - private void on_account_added(Account account) { conversations[account] = new HashMap(Jid.hash_bare_func, Jid.equals_bare_func); foreach (Conversation conversation in db.get_conversations(account)) { -- cgit v1.2.3-70-g09d2