diff options
author | Marvin W <git@larma.de> | 2018-01-12 21:03:09 +0100 |
---|---|---|
committer | fiaxh <git@mx.ax.lt> | 2018-01-28 00:38:47 +0100 |
commit | 782ae4c049e2b6fab13d7453cbb0e74610e7d200 (patch) | |
tree | 1b4cd0a1689cee0c2e2cac2ae9a5fb8ebbe63621 /libdino/src/service/module_manager.vala | |
parent | d46d071e57e599e8cfb1780597cbecb36881c4d8 (diff) | |
download | dino-782ae4c049e2b6fab13d7453cbb0e74610e7d200.tar.gz dino-782ae4c049e2b6fab13d7453cbb0e74610e7d200.zip |
Move Jid class to xmpp-vala, partially refactor namespace
Diffstat (limited to 'libdino/src/service/module_manager.vala')
-rw-r--r-- | libdino/src/service/module_manager.vala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala index 0f89f532..f5f3b63e 100644 --- a/libdino/src/service/module_manager.vala +++ b/libdino/src/service/module_manager.vala @@ -6,17 +6,17 @@ using Xmpp; namespace Dino { public class ModuleManager { - private HashMap<Account, ArrayList<Core.XmppStreamModule>> module_map = new HashMap<Account, ArrayList<Core.XmppStreamModule>>(); + private HashMap<Account, ArrayList<XmppStreamModule>> module_map = new HashMap<Account, ArrayList<XmppStreamModule>>(); private EntityCapabilitiesStorage entity_capabilities_storage; - public signal void initialize_account_modules(Account account, ArrayList<Core.XmppStreamModule> modules); + public signal void initialize_account_modules(Account account, ArrayList<XmppStreamModule> modules); public ModuleManager(Database db) { entity_capabilities_storage = new EntityCapabilitiesStorage(db); } - public T? get_module<T>(Account account, Core.ModuleIdentity<T> identity) { + public T? get_module<T>(Account account, Xmpp.ModuleIdentity<T> identity) { if (identity == null) return null; lock (module_map) { if (!module_map.has_key(account)) { @@ -30,15 +30,15 @@ public class ModuleManager { return null; } - public ArrayList<Core.XmppStreamModule> get_modules(Account account, string? resource = null) { - ArrayList<Core.XmppStreamModule> modules = new ArrayList<Core.XmppStreamModule>(); + public ArrayList<XmppStreamModule> get_modules(Account account, string? resource = null) { + ArrayList<XmppStreamModule> modules = new ArrayList<XmppStreamModule>(); lock (module_map) { if (!module_map.has_key(account)) initialize(account); - foreach (Core.XmppStreamModule module in module_map[account]) modules.add(module); + foreach (XmppStreamModule module in module_map[account]) modules.add(module); } - foreach (Core.XmppStreamModule module in module_map[account]) { + foreach (XmppStreamModule module in module_map[account]) { if (module.get_id() == Bind.Module.IDENTITY.id) { (module as Bind.Module).requested_resource == null ? account.resourcepart : resource; } else if (module.get_id() == PlainSasl.Module.IDENTITY.id) { @@ -50,7 +50,7 @@ public class ModuleManager { public void initialize(Account account) { lock(module_map) { - module_map[account] = new ArrayList<Core.XmppStreamModule>(); + module_map[account] = new ArrayList<XmppStreamModule>(); module_map[account].add(new Iq.Module()); module_map[account].add(new Tls.Module()); module_map[account].add(new Xep.SrvRecordsTls.Module()); @@ -63,7 +63,7 @@ public class ModuleManager { module_map[account].add(new Xep.PrivateXmlStorage.Module()); module_map[account].add(new Xep.Bookmarks.Module()); module_map[account].add(new Presence.Module()); - module_map[account].add(new Xmpp.Message.Module()); + module_map[account].add(new Xmpp.MessageModule()); module_map[account].add(new Xep.MessageArchiveManagement.Module()); module_map[account].add(new Xep.MessageCarbons.Module()); module_map[account].add(new Xep.Muc.Module()); |