diff options
| author | fiaxh <git@lightrise.org> | 2018-11-24 21:00:44 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2018-11-24 14:05:03 -0600 |
| commit | 22340cb88e056211cd2e08036e7a1982e37c391b (patch) | |
| tree | e35a39662c7292ad01f3a1ba64a7089e674a4b6a | |
| parent | c44489214e040f48042d27254d4c18a78e343049 (diff) | |
| download | dino-22340cb88e056211cd2e08036e7a1982e37c391b.tar.gz dino-22340cb88e056211cd2e08036e7a1982e37c391b.zip | |
Always use Account.hash(equals)_func for HashMap+ArrayList
| -rw-r--r-- | libdino/src/service/database.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/module_manager.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/add_conversation/conference_list.vala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libdino/src/service/database.vala b/libdino/src/service/database.vala index e5ddd0f2..025a97fa 100644 --- a/libdino/src/service/database.vala +++ b/libdino/src/service/database.vala @@ -268,7 +268,7 @@ public class Database : Qlite.Database { } public ArrayList<Account> get_accounts() { - ArrayList<Account> ret = new ArrayList<Account>(); + ArrayList<Account> ret = new ArrayList<Account>(Account.equals_func); foreach(Row row in account.select()) { Account account = new Account.from_row(this, row); ret.add(account); diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala index d16dc935..b9197f90 100644 --- a/libdino/src/service/module_manager.vala +++ b/libdino/src/service/module_manager.vala @@ -6,7 +6,7 @@ using Xmpp; namespace Dino { public class ModuleManager { - private HashMap<Account, ArrayList<XmppStreamModule>> module_map = new HashMap<Account, ArrayList<XmppStreamModule>>(); + private HashMap<Account, ArrayList<XmppStreamModule>> module_map = new HashMap<Account, ArrayList<XmppStreamModule>>(Account.hash_func, Account.equals_func); private EntityCapabilitiesStorage entity_capabilities_storage; diff --git a/main/src/ui/add_conversation/conference_list.vala b/main/src/ui/add_conversation/conference_list.vala index 69e8c952..2f52558d 100644 --- a/main/src/ui/add_conversation/conference_list.vala +++ b/main/src/ui/add_conversation/conference_list.vala @@ -11,7 +11,7 @@ protected class ConferenceList : FilterableList { public signal void conversation_selected(Conversation? conversation); private StreamInteractor stream_interactor; - private HashMap<Account, Gee.List<Xep.Bookmarks.Conference>> lists = new HashMap<Account, Gee.List<Xep.Bookmarks.Conference>>(); + private HashMap<Account, Gee.List<Xep.Bookmarks.Conference>> lists = new HashMap<Account, Gee.List<Xep.Bookmarks.Conference>>(Account.hash_func, Account.equals_func); public ConferenceList(StreamInteractor stream_interactor) { this.stream_interactor = stream_interactor; |